diff options
35 files changed, 77 insertions, 77 deletions
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index ab9b216020fa..e2706d9a2004 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -823,7 +823,7 @@ namespace accessibility }else if( (nIndex == 1 && (treeFlag & SvTreeFlags::CHKBTN)) || nIndex == 0 ) { if( pEntry->HasChildren() || pEntry->HasChildrenOnDemand() ) - return getListBox()->IsExpanded( pEntry ) ? \ + return getListBox()->IsExpanded( pEntry ) ? OUString(TK_RES_STRING(STR_SVT_ACC_ACTION_COLLAPSE)) : OUString(TK_RES_STRING(STR_SVT_ACC_ACTION_EXPAND)); return OUString(); diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index 6ad675d1dcab..a1ee70db97f0 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -188,7 +188,7 @@ css::uno::Sequence< OUString > SAL_CALL GridWrapper::getSupportedServiceNames() "com.sun.star.chart.ChartGrid", "com.sun.star.xml.UserDefinedAttributesSupplier", "com.sun.star.drawing.LineProperties", - "com.sun.star.beans.PropertySet"\ + "com.sun.star.beans.PropertySet" }; } diff --git a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx index 0879fbf2a2f6..eb7cddec09f6 100644 --- a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx +++ b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx @@ -79,8 +79,8 @@ const sal_uInt16 nLegendWhichPairs[] = const sal_uInt16 nDataLabelWhichPairs[] = { SCHATTR_DATADESCR_START, SCHATTR_DATADESCR_END, - SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, /* 10585 - 10585 svx/svxids.hrc */ \ - SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, /* 11432 svx/svxids.hrc */ \ + SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, /* 10585 - 10585 svx/svxids.hrc */ + SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, /* 11432 svx/svxids.hrc */ SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, EE_PARA_WRITINGDIR,EE_PARA_WRITINGDIR, 0 diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx index 7e9c466344fa..55e7bc9f9c11 100644 --- a/cli_ure/source/climaker/climaker_emit.cxx +++ b/cli_ure/source/climaker/climaker_emit.cxx @@ -339,7 +339,7 @@ Assembly ^ TypeEmitter::type_resolve( ::System::Text::StringBuilder ^ sb = gcnew ::System::Text::StringBuilder(); sb->Append(gcnew ::System::String("\nThe type ")); sb->Append(cts_name); - sb->Append(gcnew ::System::String(" \n could not be found. Did you forget to " \ + sb->Append(gcnew ::System::String(" \n could not be found. Did you forget to " "specify an additional assembly with the --reference option?\n")); if (throw_exc) throw gcnew ::System::Exception(sb->ToString(), exc); diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index a5fecc621f38..46f1e86aca1c 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -54,7 +54,7 @@ using namespace com::sun::star::sdbc; // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.AResultSet","com.sun.star.sdbc.ResultSet"); -OUString SAL_CALL OResultSet::getImplementationName( ) throw (css::uno::RuntimeException) \ +OUString SAL_CALL OResultSet::getImplementationName( ) throw (css::uno::RuntimeException) { return OUString("com.sun.star.sdbcx.ado.ResultSet"); } diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 5453452a1365..9282773a779a 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -64,7 +64,7 @@ using namespace com::sun::star::io; namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition; -OUString SAL_CALL OEvoabResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) \ +OUString SAL_CALL OEvoabResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) { return OUString("com.sun.star.sdbcx.evoab.ResultSet"); } diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index 7ebeca716020..50e5b4794f63 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -48,7 +48,7 @@ using namespace com::sun::star::util; // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); -OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) \ +OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) { return OUString("com.sun.star.sdbcx.mork.ResultSet"); } diff --git a/dbaccess/source/ui/browser/sbamultiplex.cxx b/dbaccess/source/ui/browser/sbamultiplex.cxx index 2220eceba2e2..2dfbe33e31fa 100644 --- a/dbaccess/source/ui/browser/sbamultiplex.cxx +++ b/dbaccess/source/ui/browser/sbamultiplex.cxx @@ -32,7 +32,7 @@ void SAL_CALL SbaXStatusMultiplexer::statusChanged(const css::frame::FeatureStat ::comphelper::OInterfaceIteratorHelper2 aIt( *this ); while ( aIt.hasMoreElements() ) static_cast< css::frame::XStatusListener* >( aIt.next() )->statusChanged( m_aLastKnownStatus ); -} \ +} // LoadListener IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXLoadMultiplexer, css::form::XLoadListener) diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx index de175f24617d..ed26637cbf9b 100644 --- a/dtrans/source/generic/generic_clipboard.cxx +++ b/dtrans/source/generic/generic_clipboard.cxx @@ -144,7 +144,7 @@ void SAL_CALL GenericClipboard::removeClipboardListener( const Reference< XClipb MutexGuard aGuard( rBHelper.rMutex ); OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" ); if (!rBHelper.bInDispose && !rBHelper.bDisposed) - rBHelper.aLC.removeInterface( cppu::UnoType<XClipboardListener>::get(), listener ); \ + rBHelper.aLC.removeInterface( cppu::UnoType<XClipboardListener>::get(), listener ); } Sequence< OUString > SAL_CALL GenericClipboard_getSupportedServiceNames() diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx index 11f9c16ec0e9..9323ed3ab05e 100644 --- a/dtrans/source/win32/clipb/MtaOleClipb.cxx +++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx @@ -211,10 +211,10 @@ public: m_hResult = CoInitialize( nullptr ); if ( S_OK == m_hResult ) - OSL_FAIL( \ + OSL_FAIL( "com was not yet initialzed, the thread was not created using osl_createThread" ); else if ( FAILED( m_hResult ) && !( RPC_E_CHANGED_MODE == m_hResult ) ) - OSL_FAIL( \ + OSL_FAIL( "com could not be initialized, maybe the thread was not created using osl_createThread" ); } @@ -325,7 +325,7 @@ CMtaOleClipboard::~CMtaOleClipboard( ) UnregisterClassA( g_szWndClsName, nullptr ); OSL_ENSURE( ( nullptr == m_pfncClipViewerCallback ) && - !IsWindow( m_hwndNextClipViewer ), \ + !IsWindow( m_hwndNextClipViewer ), "Clipboard viewer not properly unregistered" ); } @@ -337,7 +337,7 @@ HRESULT CMtaOleClipboard::flushClipboard( ) return E_FAIL; } - OSL_ENSURE( GetCurrentThreadId( ) != m_uOleThreadId, \ + OSL_ENSURE( GetCurrentThreadId( ) != m_uOleThreadId, "flushClipboard from within clipboard sta thread called" ); MsgCtx aMsgCtx; diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index cce2d8e5751b..8cec01b5444c 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -2269,7 +2269,7 @@ SvxUnoTextBase* SvxUnoTextBase::getImplementation( const uno::Reference< uno::XI return nullptr; } -sal_Int64 SAL_CALL SvxUnoTextBase::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) \ +sal_Int64 SAL_CALL SvxUnoTextBase::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) @@ -2348,7 +2348,7 @@ const uno::Sequence< sal_Int8 > & SvxUnoText::getUnoTunnelId() throw() return theSvxUnoTextUnoTunnelId::get().getSeq(); } -sal_Int64 SAL_CALL SvxUnoText::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) \ +sal_Int64 SAL_CALL SvxUnoText::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) diff --git a/fpicker/source/win32/folderpicker/MtaFop.hxx b/fpicker/source/win32/folderpicker/MtaFop.hxx index a068faf2e031..8853076011cc 100644 --- a/fpicker/source/win32/folderpicker/MtaFop.hxx +++ b/fpicker/source/win32/folderpicker/MtaFop.hxx @@ -68,14 +68,14 @@ public: operator sal_Unicode*( ) { - OSL_PRECOND( pBuff, \ + OSL_PRECOND( pBuff, "No path buffer allocated" ); return pBuff; } sal_Unicode* get( ) { - OSL_PRECOND( pBuff, \ + OSL_PRECOND( pBuff, "No path buffer allocated" ); return pBuff; } diff --git a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx index 2fcfa1a8fcaa..9d8956e77b8e 100644 --- a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx +++ b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx @@ -33,17 +33,17 @@ public: IndexEntrySupplier_ja_phonetic( const css::uno::Reference < css::uno::XComponentContext >& rxContext ) : IndexEntrySupplier_Common(rxContext) { implementationName = "com.sun.star.i18n.IndexEntrySupplier_ja_phonetic"; }; - virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,\ - const css::lang::Locale& rLocale, const OUString& rSortAlgorithm ) \ - throw (css::uno::RuntimeException, std::exception) override;\ - virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry, \ - const OUString& PhoneticEntry, const css::lang::Locale& rLocale )\ - throw (css::uno::RuntimeException, std::exception) override;\ - virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,\ - const OUString& PhoneticEntry1, const css::lang::Locale& rLocale1,\ - const OUString& IndexEntry2, const OUString& PhoneticEntry2,\ - const css::lang::Locale& rLocale2 )\ - throw (css::uno::RuntimeException, std::exception) override;\ + virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry, + const css::lang::Locale& rLocale, const OUString& rSortAlgorithm ) + throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry, + const OUString& PhoneticEntry, const css::lang::Locale& rLocale ) + throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1, + const OUString& PhoneticEntry1, const css::lang::Locale& rLocale1, + const OUString& IndexEntry2, const OUString& PhoneticEntry2, + const css::lang::Locale& rLocale2 ) + throw (css::uno::RuntimeException, std::exception) override; }; #define INDEXENTRYSUPPLIER_JA_PHONETIC( algorithm ) \ diff --git a/include/onlineupdate/mar_private.h b/include/onlineupdate/mar_private.h index a770998da6fe..12ff99d65e1f 100644 --- a/include/onlineupdate/mar_private.h +++ b/include/onlineupdate/mar_private.h @@ -32,7 +32,7 @@ MOZ_STATIC_ASSERT(MAX_SIZE_OF_MAR_FILE < ((int64_t)LONG_MAX), /* We store at most the size up to the signature block + 4 bytes per BLOCKSIZE bytes */ -MOZ_STATIC_ASSERT(sizeof(BLOCKSIZE) < \ +MOZ_STATIC_ASSERT(sizeof(BLOCKSIZE) < (SIGNATURE_BLOCK_OFFSET + sizeof(uint32_t)), "BLOCKSIZE is too big"); diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx index 4e2f1e0bb39c..73b9d2c2b095 100644 --- a/include/svx/msdffdef.hxx +++ b/include/svx/msdffdef.hxx @@ -26,7 +26,7 @@ #define DFF_COMMON_RECORD_HEADER_SIZE 8 -const sal_uInt32 nMaxLegalDffRecordLength = \ +const sal_uInt32 nMaxLegalDffRecordLength = SAL_MAX_UINT32 - DFF_COMMON_RECORD_HEADER_SIZE; #define DFF_PSFLAG_CONTAINER 0x0F // If the version field of a record diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx index bcdc68ea00fd..9cb6a9252cf7 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx @@ -55,7 +55,7 @@ using namespace com::sun::star::io; using namespace com::sun::star::util; // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); -::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \ +::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) { return ::rtl::OUString("com.sun.star.sdbcx.skeleton.ResultSet"); } diff --git a/onlineupdate/source/update/updater/progressui_win.cxx b/onlineupdate/source/update/updater/progressui_win.cxx index 7a0ff249442f..3d4ac09a28d4 100644 --- a/onlineupdate/source/update/updater/progressui_win.cxx +++ b/onlineupdate/source/update/updater/progressui_win.cxx @@ -153,9 +153,9 @@ InitDialog(HWND hDlg) // Calculate the additional space needed for the text by subtracting from // the rectangle returned by DrawText the existing client rectangle's width // and height. - extra.cx = (textSize.right - textSize.left) - \ + extra.cx = (textSize.right - textSize.left) - (infoSize.right - infoSize.left); - extra.cy = (textSize.bottom - textSize.top) - \ + extra.cy = (textSize.bottom - textSize.top) - (infoSize.bottom - infoSize.top); if (extra.cx < 0) extra.cx = 0; diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx index ce1ec16f9588..ec599a3416b6 100644 --- a/sal/osl/unx/file_misc.cxx +++ b/sal/osl/unx/file_misc.cxx @@ -522,7 +522,7 @@ static oslFileError create_dir_recursively_( oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, void* pData) { - OSL_PRECOND((rtl_ustr_getLength(dir_path) > 0) && ((dir_path + (rtl_ustr_getLength(dir_path) - 1)) != (dir_path + rtl_ustr_lastIndexOfChar(dir_path, '/'))), \ + OSL_PRECOND((rtl_ustr_getLength(dir_path) > 0) && ((dir_path + (rtl_ustr_getLength(dir_path) - 1)) != (dir_path + rtl_ustr_lastIndexOfChar(dir_path, '/'))), "Path must not end with a slash"); int native_err = create_dir_with_callback( diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx index 8a4a46453b65..587d97ad6453 100644 --- a/sal/osl/unx/file_path_helper.cxx +++ b/sal/osl/unx/file_path_helper.cxx @@ -105,7 +105,7 @@ void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart( const rtl_uString* pustrPath, rtl_uString** ppustrFileNameOrLastDirPart) { - OSL_PRECOND(pustrPath && ppustrFileNameOrLastDirPart, \ + OSL_PRECOND(pustrPath && ppustrFileNameOrLastDirPart, "osl_systemPathGetFileNameOrLastDirectoryPart: Invalid parameter"); rtl::OUString path(const_cast<rtl_uString*>(pustrPath)); diff --git a/sal/osl/w32/path_helper.cxx b/sal/osl/w32/path_helper.cxx index a79373d7078e..c778b152270b 100644 --- a/sal/osl/w32/path_helper.cxx +++ b/sal/osl/w32/path_helper.cxx @@ -41,7 +41,7 @@ const rtl::OUString SLASH ("/"); void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath) { - OSL_PRECOND(ppustrPath && (nullptr != *ppustrPath), \ + OSL_PRECOND(ppustrPath && (nullptr != *ppustrPath), "osl_systemPathEnsureSeparator: Invalid parameter"); rtl::OUString path(*ppustrPath); diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index 29f766bae7cc..c9883806c2cf 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -69,8 +69,8 @@ namespace /* private */ { bool operator() (const rtl::OUString& lhs, const rtl::OUString& rhs) const { - OSL_ENSURE((lhs.indexOf(NAME_VALUE_SEPARATOR) > -1) && \ - (rhs.indexOf(NAME_VALUE_SEPARATOR) > -1), \ + OSL_ENSURE((lhs.indexOf(NAME_VALUE_SEPARATOR) > -1) && + (rhs.indexOf(NAME_VALUE_SEPARATOR) > -1), "Malformed environment variable"); // Windows compares environment variables uppercase diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index efba2fcad8d4..f3b82d19b009 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -155,7 +155,7 @@ enum class ScRefFlags : sal_uInt16 COL_VALID = 0x0200, TAB_VALID = 0x0400, // BITS for convience - BITS = COL_ABS | ROW_ABS | TAB_ABS | TAB_3D \ + BITS = COL_ABS | ROW_ABS | TAB_ABS | TAB_3D | ROW_VALID | COL_VALID | TAB_VALID, // somewhat cheesy kludge to force the display of the document name even for // local references. Requires TAB_3D to be valid diff --git a/sc/source/core/opencl/op_math.cxx b/sc/source/core/opencl/op_math.cxx index 3f28e6386143..68a11c35edc2 100644 --- a/sc/source/core/opencl/op_math.cxx +++ b/sc/source/core/opencl/op_math.cxx @@ -2647,9 +2647,9 @@ void OpConvert::GenSlidingWindowFunction( // convert between as string arguments. This implementation // handles just a very small subset of such conversions. - int arg1=vSubArguments[1]->GetFormulaToken()->GetString().\ + int arg1=vSubArguments[1]->GetFormulaToken()->GetString(). getString().toAsciiUpperCase().hashCode(); - int arg2=vSubArguments[2]->GetFormulaToken()->GetString().\ + int arg2=vSubArguments[2]->GetFormulaToken()->GetString(). getString().toAsciiUpperCase().hashCode(); // Check if the from and to units are those combinations that the diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index 501f09ba7a85..e5855984b30d 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -599,8 +599,8 @@ void ScOrcusSheet::set_formula_result(os::row_t row, os::col_t col, const char* ScFormulaCell* pCell = mrDoc.getDoc().GetFormulaCell(ScAddress(col, row, mnTab)); if (!pCell) { - SAL_WARN("sc.orcus", "trying to set formula result for non formula \ - cell! Col: " << col << ";Row: " << row << ";Tab: " << mnTab); + SAL_WARN("sc.orcus", "trying to set formula result for non formula " + "cell! Col: " << col << ";Row: " << row << ";Tab: " << mnTab); return; } OUString aResult( p, n, RTL_TEXTENCODING_UTF8); @@ -612,8 +612,8 @@ void ScOrcusSheet::set_formula_result(os::row_t row, os::col_t col, double /*val ScFormulaCell* pCell = mrDoc.getDoc().GetFormulaCell(ScAddress(col, row, mnTab)); if (!pCell) { - SAL_WARN("sc.orcus", "trying to set formula result for non formula \ - cell! Col: " << col << ";Row: " << row << ";Tab: " << mnTab); + SAL_WARN("sc.orcus", "trying to set formula result for non formula " + "cell! Col: " << col << ";Row: " << row << ";Tab: " << mnTab); return; } diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 87cfcfed59cc..f7419ef3781b 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -89,10 +89,10 @@ static SvxItemPropertySet& GetStylePropertySet() TEXT_PROPERTIES_DEFAULTS CONNECTOR_PROPERTIES SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS - { OUString("TopBorder"), SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER }, \ - { OUString("BottomBorder"), SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER }, \ - { OUString("LeftBorder"), SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER }, \ - { OUString("RightBorder"), SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER }, \ + { OUString("TopBorder"), SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER }, + { OUString("BottomBorder"), SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER }, + { OUString("LeftBorder"), SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER }, + { OUString("RightBorder"), SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER }, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx index a82de19e863e..b54b666d5924 100644 --- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx @@ -175,7 +175,7 @@ void FramePainter::OffsetBitmap::PaintSide ( + rCornerBitmap1.maOffset.X()); const sal_Int32 nRight ( rAnchor2.X() - + rCornerBitmap2.maOffset.X()\ + + rCornerBitmap2.maOffset.X() - 1); for (sal_Int32 nX=nLeft; nX<=nRight; nX+=aBitmapSize.Width()) { diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index ce07b60f20eb..08f6a3219719 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -658,8 +658,8 @@ void IndexTabPage_Impl::InitializeIndex() sal_uInt32 nRefListLen = aRefList.getLength(); - DBG_ASSERT( aAnchorList.getLength(), "*IndexTabPage_Impl::InitializeIndex(): AnchorList is empty!" ); \ - DBG_ASSERT( nRefListLen, "*IndexTabPage_Impl::InitializeIndex(): RefList is empty!" ); \ + DBG_ASSERT( aAnchorList.getLength(), "*IndexTabPage_Impl::InitializeIndex(): AnchorList is empty!" ); + DBG_ASSERT( nRefListLen, "*IndexTabPage_Impl::InitializeIndex(): RefList is empty!" ); if ( aAnchorList.getLength() && nRefListLen ) { @@ -3040,7 +3040,7 @@ void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId ) aURL.Complete = ".uno:Backward"; if ( TBI_FORWARD == nActionId ) aURL.Complete = ".uno:Forward"; - Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); \ + Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict(aURL); pHelpInterceptor->dispatch( aURL, Sequence < PropertyValue >() ); break; @@ -3071,7 +3071,7 @@ void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId ) aURL.Complete = ".uno:SelectTextMode"; else aURL.Complete = ".uno:SearchDialog"; - Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); \ + Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict(aURL); Reference < XDispatch > xDisp = xProv->queryDispatch( aURL, OUString(), 0 ); if ( xDisp.is() ) diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index fc19db8f9098..934e8ca2811c 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -2428,7 +2428,7 @@ void SAL_CALL SfxBaseModel::updateCmisProperties( const Sequence< document::Cmis { ::ucbhelper::Content aContent( pMedium->GetName( ), Reference<ucb::XCommandEnvironment>(), - comphelper::getProcessComponentContext() );\ + comphelper::getProcessComponentContext() ); aContent.executeCommand( "updateProperties", uno::makeAny( aProperties ) ); loadCmisProperties( ); diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 829e1c96ebf4..ffdbfda5f78f 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -762,7 +762,7 @@ OUString SAL_CALL SfxFrameLoader_Impl::getImplementationName() throw( RuntimeExc { return OUString("com.sun.star.comp.office.FrameLoader"); } - \ + /* XServiceInfo */ sal_Bool SAL_CALL SfxFrameLoader_Impl::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) { diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 65fc32dbdf83..aab82da16cad 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -76,19 +76,19 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet() // { "HasLevels", OWN_ATTR_HASLEVELS, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY, 0}, { OUString("Style"), OWN_ATTR_STYLE, cppu::UnoType< css::style::XStyle >::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString(UNO_NAME_TEXT_WRITINGMODE), SDRATTR_TEXTDIRECTION, cppu::UnoType<css::text::WritingMode>::get(), 0, 0}, - { OUString(UNO_NAME_TEXT_HORZADJUST), SDRATTR_TEXT_HORZADJUST, cppu::UnoType<css::drawing::TextHorizontalAdjust>::get(), 0, 0}, \ - { OUString(UNO_NAME_TEXT_LEFTDIST), SDRATTR_TEXT_LEFTDIST, cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_LOWERDIST), SDRATTR_TEXT_LOWERDIST, cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_RIGHTDIST), SDRATTR_TEXT_RIGHTDIST, cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_UPPERDIST), SDRATTR_TEXT_UPPERDIST, cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_VERTADJUST), SDRATTR_TEXT_VERTADJUST, cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), 0, 0},\ - { OUString(UNO_NAME_TEXT_WORDWRAP), SDRATTR_TEXT_WORDWRAP, cppu::UnoType<bool>::get(), 0, 0}, \ - - { OUString("TableBorder"), OWN_ATTR_TABLEBORDER, cppu::UnoType<TableBorder>::get(), 0, 0 }, \ - { OUString("TopBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER }, \ - { OUString("BottomBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER }, \ - { OUString("LeftBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER }, \ - { OUString("RightBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER }, \ + { OUString(UNO_NAME_TEXT_HORZADJUST), SDRATTR_TEXT_HORZADJUST, cppu::UnoType<css::drawing::TextHorizontalAdjust>::get(), 0, 0}, + { OUString(UNO_NAME_TEXT_LEFTDIST), SDRATTR_TEXT_LEFTDIST, cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, + { OUString(UNO_NAME_TEXT_LOWERDIST), SDRATTR_TEXT_LOWERDIST, cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, + { OUString(UNO_NAME_TEXT_RIGHTDIST), SDRATTR_TEXT_RIGHTDIST, cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, + { OUString(UNO_NAME_TEXT_UPPERDIST), SDRATTR_TEXT_UPPERDIST, cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, + { OUString(UNO_NAME_TEXT_VERTADJUST), SDRATTR_TEXT_VERTADJUST, cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), 0, 0}, + { OUString(UNO_NAME_TEXT_WORDWRAP), SDRATTR_TEXT_WORDWRAP, cppu::UnoType<bool>::get(), 0, 0}, + + { OUString("TableBorder"), OWN_ATTR_TABLEBORDER, cppu::UnoType<TableBorder>::get(), 0, 0 }, + { OUString("TopBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER }, + { OUString("BottomBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER }, + { OUString("LeftBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER }, + { OUString("RightBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER }, SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_CHAR_PROPERTIES, diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 12b93a8e1ac6..02f067cf2a89 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -306,7 +306,7 @@ SvxShape* SvxShape::getImplementation( const uno::Reference< uno::XInterface >& } -sal_Int64 SAL_CALL SvxShape::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) \ +sal_Int64 SAL_CALL SvxShape::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) { @@ -3965,7 +3965,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShapeText::getTypes() return SvxShape::getTypes(); } -sal_Int64 SAL_CALL SvxShapeText::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) \ +sal_Int64 SAL_CALL SvxShapeText::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) { const sal_Int64 nReturn = SvxShape::getSomething( rId ); if( nReturn ) diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx index dccc35d720c5..475990901759 100644 --- a/sw/source/core/access/accselectionhelper.cxx +++ b/sw/source/core/access/accselectionhelper.cxx @@ -72,7 +72,7 @@ void SwAccessibleSelectionHelper::throwIndexOutOfBoundsException() Reference < XAccessibleSelection >xSelThis( xThis, UNO_QUERY ); lang::IndexOutOfBoundsException aExcept( OUString( "index out of bounds" ), - xSelThis ); \ + xSelThis ); throw aExcept; } diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index a188b3a11f56..3592bc2b1789 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -504,8 +504,8 @@ void SwTabPortion::Paint( const SwTextPaintInfo &rInf ) const #if OSL_DEBUG_LEVEL > 1 // We want to view the fixed width if( rInf.OnWin() && OPTDBG( rInf ) && - !rInf.GetOpt().IsPagePreview() && \ - !rInf.GetOpt().IsReadonly() && \ + !rInf.GetOpt().IsPagePreview() && + !rInf.GetOpt().IsReadonly() && SwViewOption::IsFieldShadings() ) { const sal_uInt16 nTmpWidth = PrtWidth(); diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index 63ea4fa7e15e..e02f33e1d207 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -621,7 +621,7 @@ SwInputChild::~SwInputChild() SfxChildWinInfo SwInputChild::GetInfo() const { - SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \ + SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); return aInfo; } diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index 3bc13339824b..8a751cf77cc6 100644 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -138,7 +138,7 @@ UcbContentProviderProxy::queryInterface( const Type & rType ) XTYPEPROVIDER_COMMON_IMPL( UcbContentProviderProxy ); -Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes() \ +Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes() throw( RuntimeException, std::exception ) { // Get original provider an forward the call... |