strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove visual noise from cli_ure

Browse source 
Change-Id: I1ddada46767b2840c663a0a077e1b723f9645b56
Reviewed-on: https://gerrit.libreoffice.org/8240
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Alexander Wilms 2014-02-25 17:47:56 +01:00 committed by Caolán McNamara
parent f480f26e61
commit 1712e6c614
8 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cli_ure/readme.txt
View file

@ -102,10 +102,10 @@ Step 5: Changing the versions in the unoil module
The unoil module builds the cli_oootypes.dll which contains the office types (offapi). Change the contents The unoil module builds the cli_oootypes.dll which contains the office types (offapi). Change the contents
of unoil/climaker/version.txt similar to the versions.txt in this module. Then rebuild the module of unoil/climaker/version.txt similar to the versions.txt in this module. Then rebuild the module
//======
The automatic test in cli_ure/qa/versioning should be extended. See the readme.txt in that directory The automatic test in cli_ure/qa/versioning should be extended. See the readme.txt in that directory
for more information. for more information.
//=====

14
cli_ure/source/climaker/climaker_app.cxx
View file

@ -112,7 +112,7 @@ static const OptionInfo s_option_infos [] = {
{ RTL_CONSTASCII_STRINGPARAM("help"), 'h', false } { RTL_CONSTASCII_STRINGPARAM("help"), 'h', false }
}; };
//==============================================================================
static OptionInfo const * get_option_info( static OptionInfo const * get_option_info(
OUString const & opt, sal_Unicode copt = '\0' ) OUString const & opt, sal_Unicode copt = '\0' )
{ {
@ -145,7 +145,7 @@ static OptionInfo const * get_option_info(
return 0; return 0;
} }
//==============================================================================
static bool is_option( static bool is_option(
OptionInfo const * option_info, sal_uInt32 * pIndex ) OptionInfo const * option_info, sal_uInt32 * pIndex )
{ {
@ -181,7 +181,7 @@ static bool is_option(
return false; return false;
} }
//==============================================================================
static inline bool read_option( static inline bool read_option(
bool * flag, OptionInfo const * option_info, sal_uInt32 * pIndex ) bool * flag, OptionInfo const * option_info, sal_uInt32 * pIndex )
{ {
@ -191,7 +191,7 @@ static inline bool read_option(
return ret; return ret;
} }
//==============================================================================
static bool read_argument( static bool read_argument(
OUString * pValue, OptionInfo const * option_info, sal_uInt32 * pIndex ) OUString * pValue, OptionInfo const * option_info, sal_uInt32 * pIndex )
{ {
@ -213,7 +213,7 @@ static bool read_argument(
return false; return false;
} }
//==============================================================================
static OUString const & path_get_working_dir() static OUString const & path_get_working_dir()
{ {
static OUString s_workingDir; static OUString s_workingDir;
@ -222,7 +222,7 @@ static OUString const & path_get_working_dir()
return s_workingDir; return s_workingDir;
} }
//==============================================================================
static OUString path_make_absolute_file_url( OUString const & path ) static OUString path_make_absolute_file_url( OUString const & path )
{ {
OUString file_url; OUString file_url;
@ -256,7 +256,7 @@ static OUString path_make_absolute_file_url( OUString const & path )
using namespace ::climaker; using namespace ::climaker;
//##############################################################################
SAL_IMPLEMENT_MAIN() SAL_IMPLEMENT_MAIN()
{ {
sal_uInt32 nCount = osl_getCommandArgCount(); sal_uInt32 nCount = osl_getCommandArgCount();

8
cli_ure/source/climaker/climaker_share.h
View file

@ -35,7 +35,7 @@
namespace climaker namespace climaker
{ {
//------------------------------------------------------------------------------
extern bool g_verbose; extern bool g_verbose;
ref struct Constants ref struct Constants
@ -79,13 +79,13 @@ ref struct Constants
}; };
//------------------------------------------------------------------------------
inline ::System::String ^ ustring_to_String( OUString const & ustr ) inline ::System::String ^ ustring_to_String( OUString const & ustr )
{ {
return gcnew ::System::String( ustr.getStr(), 0, ustr.getLength() ); return gcnew ::System::String( ustr.getStr(), 0, ustr.getLength() );
} }
//------------------------------------------------------------------------------
inline OUString String_to_ustring( ::System::String ^ str ) inline OUString String_to_ustring( ::System::String ^ str )
{ {
OSL_ASSERT( sizeof (wchar_t) == sizeof (sal_Unicode) ); OSL_ASSERT( sizeof (wchar_t) == sizeof (sal_Unicode) );
@ -108,7 +108,7 @@ static ::System::Reflection::MethodAttributes c_ctor_method_attr =
/* | xxx todo: ??? compiler does not know Instance ??? /* | xxx todo: ??? compiler does not know Instance ???
::System::Reflection::MethodAttributes::Instance*/); ::System::Reflection::MethodAttributes::Instance*/);
//==============================================================================
ref class TypeEmitter : public ::System::IDisposable ref class TypeEmitter : public ::System::IDisposable
{ {
::System::Reflection::Emit::ModuleBuilder ^ m_module_builder; ::System::Reflection::Emit::ModuleBuilder ^ m_module_builder;

4
cli_ure/source/native/native_share.h
View file

@ -32,12 +32,12 @@ namespace uno
namespace util namespace util
{ {
//------------------------------------------------------------------------------
inline ::System::String ^ ustring_to_String( OUString const & ustr ) inline ::System::String ^ ustring_to_String( OUString const & ustr )
{ {
return gcnew ::System::String( ustr.getStr(), 0, ustr.getLength() ); return gcnew ::System::String( ustr.getStr(), 0, ustr.getLength() );
} }
//------------------------------------------------------------------------------
inline OUString String_to_ustring( ::System::String ^ str ) inline OUString String_to_ustring( ::System::String ^ str )
{ {
OSL_ASSERT( sizeof (wchar_t) == sizeof (sal_Unicode) ); OSL_ASSERT( sizeof (wchar_t) == sizeof (sal_Unicode) );

6
cli_ure/source/uno_bridge/cli_base.h
View file

@ -112,7 +112,7 @@ struct BridgeRuntimeError
{} {}
}; };
//==================================================================================================
struct rtl_mem struct rtl_mem
{ {
inline static void * operator new ( size_t nSize ) inline static void * operator new ( size_t nSize )
@ -126,7 +126,7 @@ struct rtl_mem
static inline ::std::auto_ptr< rtl_mem > allocate( ::std::size_t bytes ); static inline ::std::auto_ptr< rtl_mem > allocate( ::std::size_t bytes );
}; };
//--------------------------------------------------------------------------------------------------
inline ::std::auto_ptr< rtl_mem > rtl_mem::allocate( ::std::size_t bytes ) inline ::std::auto_ptr< rtl_mem > rtl_mem::allocate( ::std::size_t bytes )
{ {
void * p = rtl_allocateMemory( bytes ); void * p = rtl_allocateMemory( bytes );
@ -135,7 +135,7 @@ inline ::std::auto_ptr< rtl_mem > rtl_mem::allocate( ::std::size_t bytes )
return ::std::auto_ptr< rtl_mem >( (rtl_mem *)p ); return ::std::auto_ptr< rtl_mem >( (rtl_mem *)p );
} }
//==================================================================================================
class TypeDescr class TypeDescr
{ {
typelib_TypeDescription * m_td; typelib_TypeDescription * m_td;

4
cli_ure/source/uno_bridge/cli_bridge.cxx
View file

@ -256,7 +256,7 @@ void SAL_CALL cli_env_disposing( uno_Environment * uno_cli_env )
uno_cli_env->pContext = 0; uno_cli_env->pContext = 0;
} }
//##################################################################################################
SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * uno_cli_env ) SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * uno_cli_env )
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
@ -283,7 +283,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * uno_cl
//member in a unmanaged class, such as Bridge. //member in a unmanaged class, such as Bridge.
CliEnvHolder::g_cli_env = gcnew Cli_environment(); CliEnvHolder::g_cli_env = gcnew Cli_environment();
} }
//##################################################################################################
SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping( SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping(
uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()

2
cli_ure/source/uno_bridge/cli_bridge.h
View file

@ -50,7 +50,7 @@ ref struct CliEnvHolder {
static Cli_environment ^ g_cli_env = nullptr; static Cli_environment ^ g_cli_env = nullptr;
}; };
//==================================================================================================
/** An instance of Bridge represents exactly one mapping therefore either /** An instance of Bridge represents exactly one mapping therefore either
m_cli2uno or m_uno2cli is valid. m_cli2uno or m_uno2cli is valid.
*/ */

2
cli_ure/source/uno_bridge/cli_proxy.cxx
View file

@ -641,7 +641,7 @@ srrm::IMessage^ UnoInterfaceProxy::constructReturnMessage(
return retVal; return retVal;
} }
//################################################################################
CliProxy::CliProxy(Bridge const* bridge, System::Object^ cliI, CliProxy::CliProxy(Bridge const* bridge, System::Object^ cliI,
typelib_TypeDescription const* td, typelib_TypeDescription const* td,
const OUString& usOid): const OUString& usOid):