From 1712e6c614ca23fd5b895dc30df8d20cc69d8958 Mon Sep 17 00:00:00 2001 From: Alexander Wilms Date: Tue, 25 Feb 2014 17:47:56 +0100 Subject: Remove visual noise from cli_ure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1ddada46767b2840c663a0a077e1b723f9645b56 Reviewed-on: https://gerrit.libreoffice.org/8240 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- cli_ure/readme.txt | 4 ++-- cli_ure/source/climaker/climaker_app.cxx | 14 +++++++------- cli_ure/source/climaker/climaker_share.h | 8 ++++---- cli_ure/source/native/native_share.h | 4 ++-- cli_ure/source/uno_bridge/cli_base.h | 6 +++--- cli_ure/source/uno_bridge/cli_bridge.cxx | 4 ++-- cli_ure/source/uno_bridge/cli_bridge.h | 2 +- cli_ure/source/uno_bridge/cli_proxy.cxx | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) (limited to 'cli_ure') diff --git a/cli_ure/readme.txt b/cli_ure/readme.txt index 4ba8bee0eec0..1f4d848f1c33 100644 --- a/cli_ure/readme.txt +++ b/cli_ure/readme.txt @@ -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 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 for more information. -//===== + diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx index c8771d65d83d..8c416d6090ad 100644 --- a/cli_ure/source/climaker/climaker_app.cxx +++ b/cli_ure/source/climaker/climaker_app.cxx @@ -112,7 +112,7 @@ static const OptionInfo s_option_infos [] = { { RTL_CONSTASCII_STRINGPARAM("help"), 'h', false } }; -//============================================================================== + static OptionInfo const * get_option_info( OUString const & opt, sal_Unicode copt = '\0' ) { @@ -145,7 +145,7 @@ static OptionInfo const * get_option_info( return 0; } -//============================================================================== + static bool is_option( OptionInfo const * option_info, sal_uInt32 * pIndex ) { @@ -181,7 +181,7 @@ static bool is_option( return false; } -//============================================================================== + static inline bool read_option( bool * flag, OptionInfo const * option_info, sal_uInt32 * pIndex ) { @@ -191,7 +191,7 @@ static inline bool read_option( return ret; } -//============================================================================== + static bool read_argument( OUString * pValue, OptionInfo const * option_info, sal_uInt32 * pIndex ) { @@ -213,7 +213,7 @@ static bool read_argument( return false; } -//============================================================================== + static OUString const & path_get_working_dir() { static OUString s_workingDir; @@ -222,7 +222,7 @@ static OUString const & path_get_working_dir() return s_workingDir; } -//============================================================================== + static OUString path_make_absolute_file_url( OUString const & path ) { OUString file_url; @@ -256,7 +256,7 @@ static OUString path_make_absolute_file_url( OUString const & path ) using namespace ::climaker; -//############################################################################## + SAL_IMPLEMENT_MAIN() { sal_uInt32 nCount = osl_getCommandArgCount(); diff --git a/cli_ure/source/climaker/climaker_share.h b/cli_ure/source/climaker/climaker_share.h index 85ed6fcab8cc..700321af3ea0 100644 --- a/cli_ure/source/climaker/climaker_share.h +++ b/cli_ure/source/climaker/climaker_share.h @@ -35,7 +35,7 @@ namespace climaker { -//------------------------------------------------------------------------------ + extern bool g_verbose; ref struct Constants @@ -79,13 +79,13 @@ ref struct Constants }; -//------------------------------------------------------------------------------ + inline ::System::String ^ ustring_to_String( OUString const & ustr ) { return gcnew ::System::String( ustr.getStr(), 0, ustr.getLength() ); } -//------------------------------------------------------------------------------ + inline OUString String_to_ustring( ::System::String ^ str ) { 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 ??? ::System::Reflection::MethodAttributes::Instance*/); -//============================================================================== + ref class TypeEmitter : public ::System::IDisposable { ::System::Reflection::Emit::ModuleBuilder ^ m_module_builder; diff --git a/cli_ure/source/native/native_share.h b/cli_ure/source/native/native_share.h index aaae581b60bf..f8a22ef7a7a6 100644 --- a/cli_ure/source/native/native_share.h +++ b/cli_ure/source/native/native_share.h @@ -32,12 +32,12 @@ namespace uno namespace util { -//------------------------------------------------------------------------------ + inline ::System::String ^ ustring_to_String( OUString const & ustr ) { return gcnew ::System::String( ustr.getStr(), 0, ustr.getLength() ); } -//------------------------------------------------------------------------------ + inline OUString String_to_ustring( ::System::String ^ str ) { OSL_ASSERT( sizeof (wchar_t) == sizeof (sal_Unicode) ); diff --git a/cli_ure/source/uno_bridge/cli_base.h b/cli_ure/source/uno_bridge/cli_base.h index 441f5adeaf7b..e70e8c1f067d 100644 --- a/cli_ure/source/uno_bridge/cli_base.h +++ b/cli_ure/source/uno_bridge/cli_base.h @@ -112,7 +112,7 @@ struct BridgeRuntimeError {} }; -//================================================================================================== + struct rtl_mem { 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 ); }; -//-------------------------------------------------------------------------------------------------- + inline ::std::auto_ptr< rtl_mem > rtl_mem::allocate( ::std::size_t 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 ); } -//================================================================================================== + class TypeDescr { typelib_TypeDescription * m_td; diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index 8485317810e0..c9dcb87fe346 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -256,7 +256,7 @@ void SAL_CALL cli_env_disposing( uno_Environment * uno_cli_env ) uno_cli_env->pContext = 0; } -//################################################################################################## + SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * uno_cli_env ) 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. CliEnvHolder::g_cli_env = gcnew Cli_environment(); } -//################################################################################################## + SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping( uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) SAL_THROW_EXTERN_C() diff --git a/cli_ure/source/uno_bridge/cli_bridge.h b/cli_ure/source/uno_bridge/cli_bridge.h index ed116ac4aa37..88cb11832e2b 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.h +++ b/cli_ure/source/uno_bridge/cli_bridge.h @@ -50,7 +50,7 @@ ref struct CliEnvHolder { static Cli_environment ^ g_cli_env = nullptr; }; -//================================================================================================== + /** An instance of Bridge represents exactly one mapping therefore either m_cli2uno or m_uno2cli is valid. */ diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx index 092cdfc16efe..cbe3fb618251 100644 --- a/cli_ure/source/uno_bridge/cli_proxy.cxx +++ b/cli_ure/source/uno_bridge/cli_proxy.cxx @@ -641,7 +641,7 @@ srrm::IMessage^ UnoInterfaceProxy::constructReturnMessage( return retVal; } -//################################################################################ + CliProxy::CliProxy(Bridge const* bridge, System::Object^ cliI, typelib_TypeDescription const* td, const OUString& usOid): -- cgit