compilerplugins/clang/constantparam.booleans.results | 4 -
cppcanvas/source/inc/tools.hxx | 6 +-
cppcanvas/source/mtfrenderer/bitmapaction.cxx | 10 +--
cppcanvas/source/mtfrenderer/implrenderer.cxx | 20 +++----
cppcanvas/source/mtfrenderer/lineaction.cxx | 4 -
cppcanvas/source/mtfrenderer/mtftools.cxx | 4 -
cppcanvas/source/mtfrenderer/mtftools.hxx | 8 +--
cppcanvas/source/mtfrenderer/pointaction.cxx | 6 +-
cppcanvas/source/mtfrenderer/polypolyaction.cxx | 14 ++---
cppcanvas/source/mtfrenderer/textaction.cxx | 38 +++++++--------
cppcanvas/source/mtfrenderer/textlineshelper.cxx | 6 +-
cppcanvas/source/mtfrenderer/textlineshelper.hxx | 8 +--
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 6 +-
cppcanvas/source/tools/tools.cxx | 16 +++---
cppcanvas/source/wrapper/implpolypolygon.cxx | 6 +-
dbaccess/source/core/dataaccess/ModelImpl.cxx | 8 +--
dbaccess/source/core/dataaccess/databasedocument.cxx | 2
dbaccess/source/core/inc/sdbcoretools.hxx | 14 +----
dbaccess/source/core/misc/sdbcoretools.cxx | 9 ++-
dbaccess/source/core/recovery/dbdocrecovery.cxx | 4 -
dbaccess/source/core/recovery/subcomponentrecovery.cxx | 4 -
registry/tools/fileurl.cxx | 4 -
registry/tools/fileurl.hxx | 4 -
registry/tools/regview.cxx | 4 -
sc/inc/ChartTools.hxx | 4 -
sc/source/ui/docshell/dbdocfun.cxx | 2
sc/source/ui/unoobj/ChartTools.cxx | 6 +-
sc/source/ui/unoobj/TablePivotChart.cxx | 4 -
sc/source/ui/unoobj/TablePivotCharts.cxx | 14 ++---
sc/source/ui/unoobj/chartuno.cxx | 14 ++---
30 files changed, 125 insertions(+), 128 deletions(-)
New commits:
commit e5968decd4d3957ca8ee9a5766387e9efc90b824
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Aug 20 13:35:10 2025 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Aug 20 15:23:35 2025 +0200
sc::tools -> sctools
At least some IDEs are confused by our multitude of `tools` namespaces,
and show errors like `namespace "tools" is ambiguous`.
This removes one such namespace. The idea is to drop all but the one
in /tools (that has tools::Long and tools::Rectangle).
Change-Id: Ib404ba7c66085a01861cd62507a479e91aa68e49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189953
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/compilerplugins/clang/constantparam.booleans.results
b/compilerplugins/clang/constantparam.booleans.results
index be4ee4d9e51d..83bdaf10e16e 100644
--- a/compilerplugins/clang/constantparam.booleans.results
+++ b/compilerplugins/clang/constantparam.booleans.results
@@ -2315,8 +2315,8 @@ sc/inc/cellformtmpl.hxx:33
_Bool bForceSystemLocale
0
sc/inc/ChartTools.hxx:46
- class SdrOle2Obj * getChartByIndex(class ScDocShell *,short,long,enum
sc::tools::ChartSourceType)
- enum sc::tools::ChartSourceType eChartSourceType
+ class SdrOle2Obj * getChartByIndex(class ScDocShell *,short,long,enum
sctools::ChartSourceType)
+ enum sctools::ChartSourceType eChartSourceType
1
sc/inc/chgtrack.hxx:705
void ScChangeActionContent::PutOldValueToDoc(class ScDocument *,short,int)
const
diff --git a/sc/inc/ChartTools.hxx b/sc/inc/ChartTools.hxx
index dbb69e2e8f7a..bcb91b31fe4c 100644
--- a/sc/inc/ChartTools.hxx
+++ b/sc/inc/ChartTools.hxx
@@ -21,7 +21,7 @@
class ScDocShell;
class SdrOle2Obj;
-namespace sc::tools {
+namespace sctools {
enum class ChartSourceType
{
@@ -48,6 +48,6 @@ SdrOle2Obj* getChartByIndex(ScDocShell* pDocShell, SCTAB nTab,
std::vector<SdrOle2Obj*> getAllPivotChartsConnectedTo(std::u16string_view
sPivotTableName, ScDocShell& rDocShell);
-} // end sc::tools
+} // end sctools
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index 760d3f1d08e1..e7a57cfaba67 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1415,7 +1415,7 @@ bool ScDBDocFunc::RemovePivotTable(const ScDPObject&
rDPObj, bool bRecord, bool
{
// If we come from GUI - ask to delete the associated pivot charts
too...
std::vector<SdrOle2Obj*> aListOfObjects =
- sc::tools::getAllPivotChartsConnectedTo(rDPObj.GetName(),
rDocShell);
+ sctools::getAllPivotChartsConnectedTo(rDPObj.GetName(),
rDocShell);
ScDrawLayer* pModel = rDoc.GetDrawLayer();
diff --git a/sc/source/ui/unoobj/ChartTools.cxx
b/sc/source/ui/unoobj/ChartTools.cxx
index 90c550e95cf4..eabb6a84dcec 100644
--- a/sc/source/ui/unoobj/ChartTools.cxx
+++ b/sc/source/ui/unoobj/ChartTools.cxx
@@ -21,7 +21,7 @@
using namespace css;
-namespace sc::tools {
+namespace sctools {
namespace {
@@ -155,7 +155,7 @@ std::vector<SdrOle2Obj*>
getAllPivotChartsConnectedTo(std::u16string_view sPivot
if (!pPage)
continue;
- sc::tools::ChartIterator aIterator(&rDocShell, nPageNo,
ChartSourceType::PIVOT_TABLE);
+ ChartIterator aIterator(&rDocShell, nPageNo,
ChartSourceType::PIVOT_TABLE);
SdrOle2Obj* pObject = aIterator.next();
while (pObject)
{
@@ -169,6 +169,6 @@ std::vector<SdrOle2Obj*>
getAllPivotChartsConnectedTo(std::u16string_view sPivot
return aObjects;
}
-} // end sc::tools
+} // end sctools
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/unoobj/TablePivotChart.cxx
b/sc/source/ui/unoobj/TablePivotChart.cxx
index 9b17b355de9a..60dac16f17c9 100644
--- a/sc/source/ui/unoobj/TablePivotChart.cxx
+++ b/sc/source/ui/unoobj/TablePivotChart.cxx
@@ -56,7 +56,7 @@ void TablePivotChart::Notify(SfxBroadcaster&, const SfxHint&
rHint)
uno::Reference<lang::XComponent> SAL_CALL TablePivotChart::getEmbeddedObject()
{
SolarMutexGuard aGuard;
- SdrOle2Obj* pObject = sc::tools::findChartsByName(m_pDocShell, m_nTab,
m_aChartName, sc::tools::ChartSourceType::PIVOT_TABLE);
+ SdrOle2Obj* pObject = sctools::findChartsByName(m_pDocShell, m_nTab,
m_aChartName, sctools::ChartSourceType::PIVOT_TABLE);
if (pObject &&
svt::EmbeddedObjectRef::TryRunningState(pObject->GetObjRef()))
return
uno::Reference<lang::XComponent>(pObject->GetObjRef()->getComponent(),
uno::UNO_QUERY);
return nullptr;
@@ -80,7 +80,7 @@ OUString SAL_CALL TablePivotChart::getPivotTableName()
{
SolarMutexGuard aGuard;
- SdrOle2Obj* pObject = sc::tools::findChartsByName(m_pDocShell, m_nTab,
m_aChartName, sc::tools::ChartSourceType::PIVOT_TABLE);
+ SdrOle2Obj* pObject = sctools::findChartsByName(m_pDocShell, m_nTab,
m_aChartName, sctools::ChartSourceType::PIVOT_TABLE);
if (!pObject)
return OUString();
diff --git a/sc/source/ui/unoobj/TablePivotCharts.cxx
b/sc/source/ui/unoobj/TablePivotCharts.cxx
index 688d872ef864..9a4ab31c6b31 100644
--- a/sc/source/ui/unoobj/TablePivotCharts.cxx
+++ b/sc/source/ui/unoobj/TablePivotCharts.cxx
@@ -164,7 +164,7 @@ void SAL_CALL TablePivotCharts::addNewByName(OUString const
& rName,
void SAL_CALL TablePivotCharts::removeByName(const OUString& rName)
{
SolarMutexGuard aGuard;
- SdrOle2Obj* pObject = sc::tools::findChartsByName(m_pDocShell, m_nTab,
rName, sc::tools::ChartSourceType::PIVOT_TABLE);
+ SdrOle2Obj* pObject = sctools::findChartsByName(m_pDocShell, m_nTab,
rName, sctools::ChartSourceType::PIVOT_TABLE);
if (pObject)
{
ScDocument& rDoc = m_pDocShell->GetDocument();
@@ -184,7 +184,7 @@ sal_Int32 SAL_CALL TablePivotCharts::getCount()
if (!m_pDocShell)
return nCount;
- sc::tools::ChartIterator aIterator(m_pDocShell, m_nTab,
sc::tools::ChartSourceType::PIVOT_TABLE);
+ sctools::ChartIterator aIterator(m_pDocShell, m_nTab,
sctools::ChartSourceType::PIVOT_TABLE);
SdrOle2Obj* pOleObject = aIterator.next();
while (pOleObject)
@@ -199,8 +199,8 @@ sal_Int32 SAL_CALL TablePivotCharts::getCount()
uno::Any SAL_CALL TablePivotCharts::getByIndex(sal_Int32 nIndex)
{
SolarMutexGuard aGuard;
- SdrOle2Obj* pObject = sc::tools::getChartByIndex(m_pDocShell, m_nTab,
nIndex,
-
sc::tools::ChartSourceType::PIVOT_TABLE);
+ SdrOle2Obj* pObject = sctools::getChartByIndex(m_pDocShell, m_nTab, nIndex,
+
sctools::ChartSourceType::PIVOT_TABLE);
if (!pObject)
throw lang::IndexOutOfBoundsException();
@@ -234,7 +234,7 @@ uno::Any SAL_CALL TablePivotCharts::getByName(OUString
const & rName)
{
SolarMutexGuard aGuard;
- if (!sc::tools::findChartsByName(m_pDocShell, m_nTab, rName,
sc::tools::ChartSourceType::PIVOT_TABLE))
+ if (!sctools::findChartsByName(m_pDocShell, m_nTab, rName,
sctools::ChartSourceType::PIVOT_TABLE))
throw container::NoSuchElementException();
uno::Reference<table::XTablePivotChart> xChart(new
TablePivotChart(m_pDocShell, m_nTab, rName));
@@ -249,7 +249,7 @@ uno::Sequence<OUString> SAL_CALL
TablePivotCharts::getElementNames()
SolarMutexGuard aGuard;
std::vector<OUString> aElements;
- sc::tools::ChartIterator aIterator(m_pDocShell, m_nTab,
sc::tools::ChartSourceType::PIVOT_TABLE);
+ sctools::ChartIterator aIterator(m_pDocShell, m_nTab,
sctools::ChartSourceType::PIVOT_TABLE);
SdrOle2Obj* pOleObject = aIterator.next();
while (pOleObject)
@@ -269,7 +269,7 @@ sal_Bool SAL_CALL TablePivotCharts::hasByName(OUString
const & rName)
{
SolarMutexGuard aGuard;
- return sc::tools::findChartsByName(m_pDocShell, m_nTab, rName,
sc::tools::ChartSourceType::PIVOT_TABLE) != nullptr;
+ return sctools::findChartsByName(m_pDocShell, m_nTab, rName,
sctools::ChartSourceType::PIVOT_TABLE) != nullptr;
}
} // end sc namespace
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 12f0e38af3da..d1eae3b117ee 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -126,9 +126,9 @@ rtl::Reference<ScChartObj>
ScChartsObj::GetObjectByIndex_Impl(tools::Long nIndex
rtl::Reference<ScChartObj> ScChartsObj::GetObjectByName_Impl(const OUString&
aName) const
{
- if (sc::tools::findChartsByName(pDocShell, nTab, aName,
sc::tools::ChartSourceType::CELL_RANGE))
+ if (sctools::findChartsByName(pDocShell, nTab, aName,
sctools::ChartSourceType::CELL_RANGE))
return new ScChartObj( pDocShell, nTab, aName );
- if (sc::tools::findChartsByName(pDocShell, nTab, aName,
sc::tools::ChartSourceType::PIVOT_TABLE))
+ if (sctools::findChartsByName(pDocShell, nTab, aName,
sctools::ChartSourceType::PIVOT_TABLE))
return new ScChartObj( pDocShell, nTab, aName );
return nullptr;
}
@@ -269,7 +269,7 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString&
rName,
void SAL_CALL ScChartsObj::removeByName( const OUString& aName )
{
SolarMutexGuard aGuard;
- SdrOle2Obj* pObj = sc::tools::findChartsByName(pDocShell, nTab, aName,
sc::tools::ChartSourceType::CELL_RANGE);
+ SdrOle2Obj* pObj = sctools::findChartsByName(pDocShell, nTab, aName,
sctools::ChartSourceType::CELL_RANGE);
if (pObj)
{
ScDocument& rDoc = pDocShell->GetDocument();
@@ -400,8 +400,8 @@ uno::Sequence<OUString> SAL_CALL
ScChartsObj::getElementNames()
sal_Bool SAL_CALL ScChartsObj::hasByName( const OUString& aName )
{
SolarMutexGuard aGuard;
- SdrOle2Obj* aOle2Obj = sc::tools::findChartsByName(pDocShell, nTab, aName,
-
sc::tools::ChartSourceType::CELL_RANGE);
+ SdrOle2Obj* aOle2Obj = sctools::findChartsByName(pDocShell, nTab, aName,
+
sctools::ChartSourceType::CELL_RANGE);
return aOle2Obj != nullptr;
}
@@ -703,8 +703,8 @@ void SAL_CALL ScChartObj::setRanges( const
uno::Sequence<table::CellRangeAddress
uno::Reference<lang::XComponent> SAL_CALL ScChartObj::getEmbeddedObject()
{
SolarMutexGuard aGuard;
- SdrOle2Obj* pObject = sc::tools::findChartsByName(pDocShell, nTab,
aChartName,
-
sc::tools::ChartSourceType::CELL_RANGE);
+ SdrOle2Obj* pObject = sctools::findChartsByName(pDocShell, nTab,
aChartName,
+
sctools::ChartSourceType::CELL_RANGE);
if ( pObject && svt::EmbeddedObjectRef::TryRunningState(
pObject->GetObjRef() ) )
{
//TODO/LATER: is it OK that something is returned for *all* objects,
not only own objects?
commit 6f14e2d0bc3a44d87870269851399182b477f6c5
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Aug 20 13:25:35 2025 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Aug 20 15:23:30 2025 +0200
dbaccess::tools -> dbaccesstools
At least some IDEs are confused by our multitude of `tools` namespaces,
and show errors like `namespace "tools" is ambiguous`.
This removes one such namespace. The idea is to drop all but the one
in /tools (that has tools::Long and tools::Rectangle).
Change-Id: Ic718fa1be0ca34fc38fda10859f11d5a949b2603
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189951
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx
b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 9b8a1f81cc33..be5c10737131 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -231,7 +231,7 @@ void DocumentStorageAccess::commitStorages()
{
for (auto const& exposedStorage : m_aExposedStorages)
{
- tools::stor::commitStorageIfWriteable( exposedStorage.second );
+ dbaccesstools::commitStorageIfWriteable( exposedStorage.second );
}
}
catch(const WrappedTargetException&)
@@ -251,7 +251,7 @@ bool DocumentStorageAccess::commitEmbeddedStorage( bool
_bPreventRootCommits )
{
NamedStorages::const_iterator pos = m_aExposedStorages.find(
u"database"_ustr );
if ( pos != m_aExposedStorages.end() )
- bSuccess = tools::stor::commitStorageIfWriteable( pos->second );
+ bSuccess = dbaccesstools::commitStorageIfWriteable( pos->second );
}
catch( Exception& )
{
@@ -859,7 +859,7 @@ bool
ODatabaseModelImpl::commitStorageIfWriteable_ignoreErrors( const Reference<
bool bSuccess = false;
try
{
- bSuccess = tools::stor::commitStorageIfWriteable( _rxStorage );
+ bSuccess = dbaccesstools::commitStorageIfWriteable( _rxStorage );
}
catch( const Exception& )
{
@@ -1247,7 +1247,7 @@ Reference< XStorage > const &
ODatabaseModelImpl::impl_switchToStorage_throw( co
lcl_rebaseScriptStorage_throw( m_xBasicLibraries,
m_xDocumentStorage.getTyped() );
lcl_rebaseScriptStorage_throw( m_xDialogLibraries,
m_xDocumentStorage.getTyped() );
- m_bReadOnly = !tools::stor::storageIsWritable_nothrow(
m_xDocumentStorage.getTyped() );
+ m_bReadOnly = !dbaccesstools::storageIsWritable_nothrow(
m_xDocumentStorage.getTyped() );
// TODO: our data source, if it exists, must broadcast the change of its
ReadOnly property
return m_xDocumentStorage.getTyped();
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index e622e029842c..0e2eb08524d9 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -620,7 +620,7 @@ void SAL_CALL ODatabaseDocument::storeToRecoveryFile( const
OUString& i_TargetLo
aDocRecovery.saveModifiedSubComponents( xTargetStorage, m_aControllers
);
// commit the root storage
- tools::stor::commitStorageIfWriteable( xTargetStorage );
+ dbaccesstools::commitStorageIfWriteable( xTargetStorage );
}
catch( const IOException& )
{
diff --git a/dbaccess/source/core/inc/sdbcoretools.hxx
b/dbaccess/source/core/inc/sdbcoretools.hxx
index 5b100dcf1783..05e04b1bcf81 100644
--- a/dbaccess/source/core/inc/sdbcoretools.hxx
+++ b/dbaccess/source/core/inc/sdbcoretools.hxx
@@ -34,10 +34,10 @@ namespace dbaccess
*/
OUString extractExceptionMessage( const css::uno::Reference<
css::uno::XComponentContext >& _rContext, const css::uno::Any& _rError );
- namespace tools
- {
- namespace stor
- {
+} // namespace dbaccess
+
+namespace dbaccesstools
+{
bool storageIsWritable_nothrow(
const css::uno::Reference< css::embed::XStorage >&
_rxStorage
);
@@ -46,10 +46,6 @@ namespace dbaccess
bool commitStorageIfWriteable(
const css::uno::Reference< css::embed::XStorage >&
_rxStorage
);
- }
-
- }
-
-} // namespace dbaccess
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx
b/dbaccess/source/core/misc/sdbcoretools.cxx
index f21344430333..f3ba35d36c3a 100644
--- a/dbaccess/source/core/misc/sdbcoretools.cxx
+++ b/dbaccess/source/core/misc/sdbcoretools.cxx
@@ -99,8 +99,13 @@ namespace dbaccess
return sDisplayMessage;
}
+} // namespace dbaccess
- namespace tools::stor {
+namespace dbaccesstools {
+
+ using namespace ::com::sun::star::uno;
+ using namespace ::com::sun::star::beans;
+ using namespace ::com::sun::star::embed;
bool storageIsWritable_nothrow( const Reference< XStorage >& _rxStorage )
{
@@ -135,6 +140,4 @@ namespace dbaccess
}
-} // namespace dbaccess
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx
b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index d367517a0315..d611354dfce8 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -243,12 +243,12 @@ namespace dbaccess
Reference< XStorage > xComponentsStor(
xRecoveryStorage->openStorageElement(
SubComponentRecovery::getComponentsStorageName( elem.first
), ElementModes::WRITE | ElementModes::NOCREATE ) );
lcl_writeObjectMap_throw( mxContext, xComponentsStor,
elem.second );
- tools::stor::commitStorageIfWriteable( xComponentsStor );
+ dbaccesstools::commitStorageIfWriteable( xComponentsStor );
}
}
// commit the recovery storage
- tools::stor::commitStorageIfWriteable( xRecoveryStorage );
+ dbaccesstools::commitStorageIfWriteable( xRecoveryStorage );
}
void DatabaseDocumentRecovery::recoverSubDocuments( const Reference<
XStorage >& i_rDocumentStorage,
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index f60a370c19c5..2cf8ea3a43f4 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -402,8 +402,8 @@ namespace dbaccess
}
// commit the storage(s)
- tools::stor::commitStorageIfWriteable( xObjectStor );
- tools::stor::commitStorageIfWriteable( xComponentsStorage );
+ dbaccesstools::commitStorageIfWriteable( xObjectStor );
+ dbaccesstools::commitStorageIfWriteable( xComponentsStorage );
// remember the relationship from the component name to the storage
name
MapStringToCompDesc& rMapCompDescs = io_mapCompDescs[ m_eType ];
diff --git a/registry/tools/fileurl.cxx b/registry/tools/fileurl.cxx
index ce99be5a198b..a78b4376a2ab 100644
--- a/registry/tools/fileurl.cxx
+++ b/registry/tools/fileurl.cxx
@@ -34,7 +34,7 @@
using osl::FileBase;
-namespace registry::tools
+namespace registrytools
{
OUString convertToFileUrl(char const* filename, sal_Int32 length)
{
@@ -72,6 +72,6 @@ OUString convertToFileUrl(char const* filename, sal_Int32
length)
return uFileUrl;
}
-} // namespace registry::tools
+} // namespace registrytools
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/tools/fileurl.hxx b/registry/tools/fileurl.hxx
index c09c7ff6a913..c5c395b271d7 100644
--- a/registry/tools/fileurl.hxx
+++ b/registry/tools/fileurl.hxx
@@ -22,11 +22,11 @@
#include <rtl/ustring.hxx>
-namespace registry::tools
+namespace registrytools
{
OUString convertToFileUrl(char const* filename, sal_Int32 length);
-} // namespace registry::tools
+} // namespace registrytools
#endif /* INCLUDED_REGISTRY_TOOLS_FILEURL_HXX */
diff --git a/registry/tools/regview.cxx b/registry/tools/regview.cxx
index 56aa343f4254..0a77ddd9431d 100644
--- a/registry/tools/regview.cxx
+++ b/registry/tools/regview.cxx
@@ -26,8 +26,6 @@
#include <stdio.h>
#include <string.h>
-using namespace registry::tools;
-
#if (defined UNX)
int main( int argc, char * argv[] )
#else
@@ -45,7 +43,7 @@ int __cdecl main( int argc, char * argv[] )
exit(1);
}
- OUString regName( convertToFileUrl(argv[1], strlen(argv[1])) );
+ OUString regName( registrytools::convertToFileUrl(argv[1],
strlen(argv[1])) );
if (reg_openRegistry(regName.pData, &hReg) != RegError::NO_ERROR)
{
fprintf(stderr, "open registry \"%s\" failed
", argv[1]);
commit f7f6ed3975bc02b16c76a780448b2f28a02a0496
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Aug 20 13:10:13 2025 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Aug 20 15:23:24 2025 +0200
cppcanvas::tools -> cppcanvastools
At least some IDEs are confused by our multitude of `tools` namespaces,
and show errors like `namespace "tools" is ambiguous`.
This removes one such namespace. The idea is to drop all but the one
in /tools (that has tools::Long and tools::Rectangle).
Change-Id: I7ae7452618bdad919cc01d9f5c08cbc44cb5339d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189950
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/cppcanvas/source/inc/tools.hxx b/cppcanvas/source/inc/tools.hxx
index dadd1b3a0b93..569cfa040151 100644
--- a/cppcanvas/source/inc/tools.hxx
+++ b/cppcanvas/source/inc/tools.hxx
@@ -22,11 +22,11 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <cppcanvas/color.hxx>
-namespace cppcanvas::tools
+namespace cppcanvastools
{
- css::uno::Sequence< double > intSRGBAToDoubleSequence( IntSRGBA );
+ css::uno::Sequence< double > intSRGBAToDoubleSequence(
cppcanvas::IntSRGBA );
- IntSRGBA doubleSequenceToIntSRGBA( const css::uno::Sequence< double >&
rColor );
+ cppcanvas::IntSRGBA doubleSequenceToIntSRGBA( const
css::uno::Sequence< double >& rColor );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index b60c0009b0aa..944b3d1fd563 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -83,7 +83,7 @@ namespace cppcanvas::internal
mxBitmap( vcl::unotools::xBitmapFromBitmap( rBmpEx ) ),
mpCanvas( rCanvas )
{
- tools::initRenderState(maState,rState);
+ cppcanvastools::initRenderState(maState,rState);
// Setup transformation such that the next render call is
// moved rPoint away.
@@ -92,7 +92,7 @@ namespace cppcanvas::internal
aLocalTransformation );
// correct clip (which is relative to original transform)
- tools::modifyClip( maState,
+ cppcanvastools::modifyClip( maState,
rState,
rCanvas,
rDstPoint,
@@ -109,7 +109,7 @@ namespace cppcanvas::internal
mxBitmap( vcl::unotools::xBitmapFromBitmap( rBmp ) ),
mpCanvas( rCanvas )
{
- tools::initRenderState(maState,rState);
+ cppcanvastools::initRenderState(maState,rState);
// Setup transformation such that the next render call is
// moved rPoint away, and scaled according to the ratio
@@ -123,7 +123,7 @@ namespace cppcanvas::internal
::canvastools::appendToRenderState( maState,
aLocalTransformation );
// correct clip (which is relative to original transform)
- tools::modifyClip( maState,
+ cppcanvastools::modifyClip( maState,
rState,
rCanvas,
rDstPoint,
@@ -166,7 +166,7 @@ namespace cppcanvas::internal
const geometry::IntegerSize2D aSize( mxBitmap->getSize() );
- return tools::calcDevicePixelBounds( ::basegfx::B2DRange( 0,0,
+ return cppcanvastools::calcDevicePixelBounds(
::basegfx::B2DRange( 0,0,
aSize.Width,
aSize.Height ),
mpCanvas->getViewState(),
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 0b521e8314ef..16ec46af8312 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1255,7 +1255,7 @@ namespace cppcanvas::internal
// modify current mapModeTransformation
// transformation, such that subsequent
// coordinates map correctly
- tools::calcLogic2PixelAffineTransform(
rStates.getState().mapModeTransform,
+ cppcanvastools::calcLogic2PixelAffineTransform(
rStates.getState().mapModeTransform,
rVDev );
break;
@@ -1714,7 +1714,7 @@ namespace cppcanvas::internal
// (the metafile comment works in
// logical coordinates).
::basegfx::B2DHomMatrix
aLogic2PixelTransform;
- aMatrix *=
tools::calcLogic2PixelLinearTransform( aLogic2PixelTransform,
+ aMatrix *=
cppcanvastools::calcLogic2PixelLinearTransform( aLogic2PixelTransform,
rVDev );
::basegfx::unotools::affineMatrixFromHomMatrix(
@@ -2480,7 +2480,7 @@ namespace cppcanvas::internal
MetaTextLineAction* pAct =
static_cast<MetaTextLineAction*>(pCurrAct);
const OutDevState& rState( rStates.getState() );
- const ::Size aBaselineOffset(
tools::getBaselineOffset( rState,
+ const ::Size aBaselineOffset(
cppcanvastools::getBaselineOffset( rState,
rVDev ) );
const ::basegfx::B2DSize aSize(
rState.mapModeTransform *
::basegfx::B2DSize(pAct->GetWidth(),
@@ -2488,13 +2488,13 @@ namespace cppcanvas::internal
std::shared_ptr<Action> pPolyAction(
PolyPolyActionFactory::createPolyPolyAction(
- tools::createTextLinesPolyPolygon(
+ cppcanvastools::createTextLinesPolyPolygon(
rState.mapModeTransform *
::basegfx::B2DPoint(
vcl::unotools::b2DPointFromPoint(pAct->GetStartPoint()) +
vcl::unotools::b2DVectorFromSize(aBaselineOffset)),
aSize.getWidth(),
- tools::createTextLineInfo( rVDev,
+ cppcanvastools::createTextLineInfo( rVDev,
rState )),
rCanvas,
rState ) );
@@ -2887,7 +2887,7 @@ namespace cppcanvas::internal
aStateStack.getState().transform.scale( 1.0 / aMtfSizePix.Width(),
1.0 /
aMtfSizePix.Height() );
- tools::calcLogic2PixelAffineTransform(
aStateStack.getState().mapModeTransform,
+ cppcanvastools::calcLogic2PixelAffineTransform(
aStateStack.getState().mapModeTransform,
*aVDev );
{
@@ -2896,7 +2896,7 @@ namespace cppcanvas::internal
rState.textColor =
rState.textFillColor =
rState.textOverlineColor =
- rState.textLineColor = tools::intSRGBAToDoubleSequence(
0x000000FF );
+ rState.textLineColor =
cppcanvastools::intSRGBAToDoubleSequence( 0x000000FF );
}
// apply overrides from the Parameters struct
@@ -2904,13 +2904,13 @@ namespace cppcanvas::internal
{
::cppcanvas::internal::OutDevState& rState =
aStateStack.getState();
rState.isFillColorSet = true;
- rState.fillColor = tools::intSRGBAToDoubleSequence(
*rParams.maFillColor );
+ rState.fillColor = cppcanvastools::intSRGBAToDoubleSequence(
*rParams.maFillColor );
}
if( rParams.maLineColor )
{
::cppcanvas::internal::OutDevState& rState =
aStateStack.getState();
rState.isLineColorSet = true;
- rState.lineColor = tools::intSRGBAToDoubleSequence(
*rParams.maLineColor );
+ rState.lineColor = cppcanvastools::intSRGBAToDoubleSequence(
*rParams.maLineColor );
}
if( rParams.maTextColor )
{
@@ -2921,7 +2921,7 @@ namespace cppcanvas::internal
rState.textColor =
rState.textFillColor =
rState.textOverlineColor =
- rState.textLineColor = tools::intSRGBAToDoubleSequence(
*rParams.maTextColor );
+ rState.textLineColor =
cppcanvastools::intSRGBAToDoubleSequence( *rParams.maTextColor );
}
if( rParams.maFontName ||
rParams.maFontWeight ||
diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx
b/cppcanvas/source/mtfrenderer/lineaction.cxx
index b5a262f0c5e0..2e57ac133395 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.cxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.cxx
@@ -77,7 +77,7 @@ namespace cppcanvas::internal
maEndPoint( rEndPoint ),
mpCanvas(std::move( xCanvas ))
{
- tools::initRenderState(maState,rState);
+ cppcanvastools::initRenderState(maState,rState);
maState.DeviceColor = rState.lineColor;
}
@@ -114,7 +114,7 @@ namespace cppcanvas::internal
rendering::RenderState aLocalState( maState );
::canvastools::prependToRenderState(aLocalState,
rTransformation);
- return tools::calcDevicePixelBounds( ::basegfx::B2DRange(
maStartPoint,
+ return cppcanvastools::calcDevicePixelBounds(
::basegfx::B2DRange( maStartPoint,
maEndPoint ),
mpCanvas->getViewState(),
aLocalState );
diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx
b/cppcanvas/source/mtfrenderer/mtftools.cxx
index 8baace023dbd..b09cc1338cc8 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.cxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.cxx
@@ -37,7 +37,7 @@
using namespace ::com::sun::star;
-namespace cppcanvas::tools
+namespace cppcanvastools
{
void initRenderState( rendering::RenderState&
renderState,
const ::cppcanvas::internal::OutDevState&
outdevState )
@@ -111,7 +111,7 @@ namespace cppcanvas::tools
bool modifyClip( rendering::RenderState&
o_rRenderState,
const struct ::cppcanvas::internal::OutDevState&
rOutdevState,
- const CanvasSharedPtr&
rCanvas,
+ const ::cppcanvas::CanvasSharedPtr&
rCanvas,
const ::basegfx::B2DPoint&
rOffset,
const ::basegfx::B2DVector*
pScaling,
const double*
pRotation )
diff --git a/cppcanvas/source/mtfrenderer/mtftools.hxx
b/cppcanvas/source/mtfrenderer/mtftools.hxx
index 13970a51874b..036550d2762d 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.hxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.hxx
@@ -43,9 +43,10 @@ namespace cppcanvas
{
struct OutDevState;
}
+}
- namespace tools
- {
+namespace cppcanvastools
+{
/** Init render state from OutDevState
This method initializes the given render state object,
@@ -131,7 +132,7 @@ namespace cppcanvas
*/
bool modifyClip( css::rendering::RenderState&
o_rRenderState,
const struct ::cppcanvas::internal::OutDevState&
rOutdevState,
- const CanvasSharedPtr&
rCanvas,
+ const ::cppcanvas::CanvasSharedPtr&
rCanvas,
const ::basegfx::B2DPoint&
rOffset,
const ::basegfx::B2DVector*
pScaling,
const double*
pRotation );
@@ -206,7 +207,6 @@ namespace cppcanvas
::basegfx::B2DPolyPolygon&
rUnderlinePolyPoly,
::basegfx::B2DPolyPolygon&
rStrikeoutPolyPoly );
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx
b/cppcanvas/source/mtfrenderer/pointaction.cxx
index 9d8631ba2c0f..9f4374457c91 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.cxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.cxx
@@ -78,7 +78,7 @@ namespace cppcanvas::internal
maPoint( rPoint ),
mpCanvas(std::move( xCanvas ))
{
- tools::initRenderState(maState,rState);
+ cppcanvastools::initRenderState(maState,rState);
maState.DeviceColor = rState.lineColor;
}
@@ -89,7 +89,7 @@ namespace cppcanvas::internal
maPoint( rPoint ),
mpCanvas( rCanvas )
{
- tools::initRenderState(maState,rState);
+ cppcanvastools::initRenderState(maState,rState);
maState.DeviceColor = vcl::unotools::colorToDoubleSequence(
rAltColor,
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() );
@@ -127,7 +127,7 @@ namespace cppcanvas::internal
rendering::RenderState aLocalState( maState );
::canvastools::prependToRenderState(aLocalState,
rTransformation);
- return tools::calcDevicePixelBounds( ::basegfx::B2DRange(
maPoint.getX()-1,
+ return cppcanvastools::calcDevicePixelBounds(
::basegfx::B2DRange( maPoint.getX()-1,
maPoint.getY()-1,
maPoint.getX()+1,
maPoint.getY()+1 ),
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index 0fafc991d7e0..2ffef8b79aac 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -92,7 +92,7 @@ namespace cppcanvas::internal
maBounds( ::basegfx::utils::getRange(rPolyPoly) ),
mpCanvas( rCanvas )
{
- tools::initRenderState(maState,rState);
+ cppcanvastools::initRenderState(maState,rState);
if( bFill )
maFillColor = rState.fillColor;
@@ -112,7 +112,7 @@ namespace cppcanvas::internal
maBounds( ::basegfx::utils::getRange(rPolyPoly) ),
mpCanvas( rCanvas )
{
- tools::initRenderState(maState,rState);
+ cppcanvastools::initRenderState(maState,rState);
if( bFill )
{
@@ -192,7 +192,7 @@ namespace cppcanvas::internal
rendering::RenderState aLocalState( maState );
::canvastools::prependToRenderState(aLocalState,
rTransformation);
- return tools::calcDevicePixelBounds(
+ return cppcanvastools::calcDevicePixelBounds(
maBounds,
mpCanvas->getViewState(),
aLocalState );
@@ -262,7 +262,7 @@ namespace cppcanvas::internal
mpCanvas( rCanvas ),
maTexture( rTexture )
{
- tools::initRenderState(maState,rState);
+ cppcanvastools::initRenderState(maState,rState);
}
bool TexturedPolyPolyAction::renderPrimitive( uno::Reference<
rendering::XCachedPrimitive >& rCachedPrimitive,
@@ -303,7 +303,7 @@ namespace cppcanvas::internal
rendering::RenderState aLocalState( maState );
::canvastools::prependToRenderState(aLocalState,
rTransformation);
- return tools::calcDevicePixelBounds(
+ return cppcanvastools::calcDevicePixelBounds(
maBounds,
mpCanvas->getViewState(),
aLocalState );
@@ -371,7 +371,7 @@ namespace cppcanvas::internal
mpCanvas( rCanvas ),
maStrokeAttributes(std::move( aStrokeAttributes ))
{
- tools::initRenderState(maState,rState);
+ cppcanvastools::initRenderState(maState,rState);
maState.DeviceColor = rState.lineColor;
}
@@ -411,7 +411,7 @@ namespace cppcanvas::internal
rendering::RenderState aLocalState( maState );
::canvastools::prependToRenderState(aLocalState,
rTransformation);
- return tools::calcDevicePixelBounds(
+ return cppcanvastools::calcDevicePixelBounds(
maBounds,
mpCanvas->getViewState(),
aLocalState );
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx
b/cppcanvas/source/mtfrenderer/textaction.cxx
index baab54fc45ca..72e3cafc7396 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -59,7 +59,7 @@ namespace cppcanvas::internal
const OutDevState& rState,
const CanvasSharedPtr& rCanvas )
{
- tools::initRenderState(o_rRenderState,rState);
+ cppcanvastools::initRenderState(o_rRenderState,rState);
// #i36950# Offset clip back to origin (as it's also moved
// by rStartPoint)
@@ -67,7 +67,7 @@ namespace cppcanvas::internal
// since this, opposed to the FontMatrix rotation
// elsewhere, _does_ get incorporated into the render
// state transform.
- tools::modifyClip( o_rRenderState,
+ cppcanvastools::modifyClip( o_rRenderState,
rState,
rCanvas,
rStartPoint,
@@ -571,7 +571,7 @@ namespace cppcanvas::internal
aBounds.getMaxX() +
rShadowOffset.getWidth(),
aBounds.getMaxY() +
rShadowOffset.getHeight() ) );
- return tools::calcDevicePixelBounds( aTotalBounds,
+ return cppcanvastools::calcDevicePixelBounds( aTotalBounds,
rViewState,
rRenderState );
}
@@ -580,10 +580,10 @@ namespace cppcanvas::internal
uno::Reference<
rendering::XPolyPolygon2D >& o_rTextLines,
const CanvasSharedPtr&
rCanvas,
double
nLineWidth,
- const tools::TextLineInfo&
rLineInfo )
+ const
cppcanvastools::TextLineInfo& rLineInfo )
{
const ::basegfx::B2DPolyPolygon aPoly(
- tools::createTextLinesPolyPolygon( 0.0, nLineWidth,
+ cppcanvastools::createTextLinesPolyPolygon( 0.0,
nLineWidth,
rLineInfo ) );
auto aRange = basegfx::utils::getRange( aPoly ).getRange();
o_rOverallSize = basegfx::B2DSize(aRange.getX(),
aRange.getY());
@@ -718,7 +718,7 @@ namespace cppcanvas::internal
rendering::RenderState aLocalState( maState );
::canvastools::prependToRenderState(aLocalState,
rTransformation);
- return tools::calcDevicePixelBounds(
::basegfx::unotools::b2DRectangleFromRealRectangle2D(
+ return cppcanvastools::calcDevicePixelBounds(
::basegfx::unotools::b2DRectangleFromRealRectangle2D(
xTextLayout->queryTextBounds() ),
mpCanvas->getViewState(),
aLocalState );
@@ -809,7 +809,7 @@ namespace cppcanvas::internal
const rendering::StringContext maStringContext;
const CanvasSharedPtr mpCanvas;
rendering::RenderState maState;
- const tools::TextLineInfo maTextLineInfo;
+ const cppcanvastools::TextLineInfo
maTextLineInfo;
::basegfx::B2DSize maLinesOverallSize;
uno::Reference< rendering::XPolyPolygon2D > mxTextLines;
const ::basegfx::B2DSize maReliefOffset;
@@ -835,7 +835,7 @@ namespace cppcanvas::internal
mxFont( rState.xFont ),
maStringContext( rText, nStartPos, nLen ),
mpCanvas( rCanvas ),
- maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ),
+ maTextLineInfo( cppcanvastools::createTextLineInfo( rVDev,
rState ) ),
maReliefOffset( rReliefOffset ),
maReliefColor( rReliefColor ),
maShadowOffset( rShadowOffset ),
@@ -874,7 +874,7 @@ namespace cppcanvas::internal
mxFont( rState.xFont ),
maStringContext( rText, nStartPos, nLen ),
mpCanvas( rCanvas ),
- maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ),
+ maTextLineInfo( cppcanvastools::createTextLineInfo( rVDev,
rState ) ),
maReliefOffset( rReliefOffset ),
maReliefColor( rReliefColor ),
maShadowOffset( rShadowOffset ),
@@ -1162,7 +1162,7 @@ namespace cppcanvas::internal
rendering::RenderState aLocalState( maState );
::canvastools::prependToRenderState(aLocalState,
rTransformation);
- return tools::calcDevicePixelBounds(
::basegfx::unotools::b2DRectangleFromRealRectangle2D(
+ return cppcanvastools::calcDevicePixelBounds(
::basegfx::unotools::b2DRectangleFromRealRectangle2D(
mxTextLayout->queryTextBounds() ),
mpCanvas->getViewState(),
aLocalState );
@@ -1189,7 +1189,7 @@ namespace cppcanvas::internal
if( !xTextLayout.is() )
return ::basegfx::B2DRange(); // empty layout, empty bounds
- return tools::calcDevicePixelBounds(
::basegfx::unotools::b2DRectangleFromRealRectangle2D(
+ return cppcanvastools::calcDevicePixelBounds(
::basegfx::unotools::b2DRectangleFromRealRectangle2D(
xTextLayout->queryTextBounds() ),
mpCanvas->getViewState(),
aLocalState );
@@ -1267,7 +1267,7 @@ namespace cppcanvas::internal
uno::Reference< rendering::XTextLayout > mxTextLayout;
const CanvasSharedPtr mpCanvas;
rendering::RenderState maState;
- const tools::TextLineInfo maTextLineInfo;
+ const cppcanvastools::TextLineInfo
maTextLineInfo;
TextLinesHelper
maTextLinesHelper;
const ::basegfx::B2DSize maReliefOffset;
const ::Color maReliefColor;
@@ -1292,7 +1292,7 @@ namespace cppcanvas::internal
const
CanvasSharedPtr& rCanvas,
const OutDevState&
rState ) :
mpCanvas( rCanvas ),
- maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ),
+ maTextLineInfo( cppcanvastools::createTextLineInfo( rVDev,
rState ) ),
maTextLinesHelper(mpCanvas, rState),
maReliefOffset( rReliefOffset ),
maReliefColor( rReliefColor ),
@@ -1332,7 +1332,7 @@ namespace cppcanvas::internal
const OutDevState&
rState,
const
::basegfx::B2DHomMatrix& rTextTransform ) :
mpCanvas( rCanvas ),
- maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ),
+ maTextLineInfo( cppcanvastools::createTextLineInfo( rVDev,
rState ) ),
maTextLinesHelper(mpCanvas, rState),
maReliefOffset( rReliefOffset ),
maReliefColor( rReliefColor ),
@@ -1561,7 +1561,7 @@ namespace cppcanvas::internal
// ===================================
const ::basegfx::B2DPolyPolygon aPoly(
- tools::createTextLinesPolyPolygon(
+ cppcanvastools::createTextLinesPolyPolygon(
0.0, nMaxPos - nMinPos,
maTextLineInfo ) );
@@ -1647,7 +1647,7 @@ namespace cppcanvas::internal
double
mnOutlineWidth;
const uno::Sequence< double >
maFillColor;
uno::Reference< rendering::XPolyPolygon2D >
mxBackgroundFillPoly;
- const tools::TextLineInfo
maTextLineInfo;
+ const cppcanvastools::TextLineInfo
maTextLineInfo;
::basegfx::B2DSize
maLinesOverallSize;
const ::basegfx::B2DRectangle
maOutlineBounds;
uno::Reference< rendering::XPolyPolygon2D >
mxTextLines;
@@ -1693,7 +1693,7 @@ namespace cppcanvas::internal
COL_WHITE,
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() )),
mxBackgroundFillPoly(std::move( xFillPoly )),
- maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ),
+ maTextLineInfo( cppcanvastools::createTextLineInfo( rVDev,
rState ) ),
maOutlineBounds( rOutlineBounds ),
maReliefOffset( rReliefOffset ),
maReliefColor( rReliefColor ),
@@ -1740,7 +1740,7 @@ namespace cppcanvas::internal
COL_WHITE,
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() )),
mxBackgroundFillPoly(std::move( xFillPoly )),
- maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ),
+ maTextLineInfo( cppcanvastools::createTextLineInfo( rVDev,
rState ) ),
maOutlineBounds( rOutlineBounds ),
maReliefOffset( rReliefOffset ),
maReliefColor( rReliefColor ),
@@ -2169,7 +2169,7 @@ namespace cppcanvas::internal
const
Renderer::Parameters& rParms,
bool
bSubsettable )
{
- const ::Size aBaselineOffset( tools::getBaselineOffset( rState,
+ const ::Size aBaselineOffset( cppcanvastools::getBaselineOffset(
rState,
rVDev ) );
// #143885# maintain (nearly) full precision positioning,
// by circumventing integer-based OutDev-mapping
diff --git a/cppcanvas/source/mtfrenderer/textlineshelper.cxx
b/cppcanvas/source/mtfrenderer/textlineshelper.cxx
index 21e4083e3d74..e56ed7439bf9 100644
--- a/cppcanvas/source/mtfrenderer/textlineshelper.cxx
+++ b/cppcanvas/source/mtfrenderer/textlineshelper.cxx
@@ -44,12 +44,12 @@ TextLinesHelper::TextLinesHelper(CanvasSharedPtr xCanvas,
const OutDevState& rSt
{
}
-void TextLinesHelper::init(double nLineWidth, const tools::TextLineInfo&
rLineInfo)
+void TextLinesHelper::init(double nLineWidth, const
cppcanvastools::TextLineInfo& rLineInfo)
{
::basegfx::B2DRange aRange; // default is empty.
::basegfx::B2DPolyPolygon aOverline, aUnderline, aStrikeout;
- tools::createTextLinesPolyPolygon(0.0, nLineWidth, rLineInfo, aOverline,
aUnderline,
- aStrikeout);
+ cppcanvastools::createTextLinesPolyPolygon(0.0, nLineWidth, rLineInfo,
aOverline, aUnderline,
+ aStrikeout);
mxOverline.clear();
mxUnderline.clear();
diff --git a/cppcanvas/source/mtfrenderer/textlineshelper.hxx
b/cppcanvas/source/mtfrenderer/textlineshelper.hxx
index f0a53ff7a07d..64eb6e7bfc23 100644
--- a/cppcanvas/source/mtfrenderer/textlineshelper.hxx
+++ b/cppcanvas/source/mtfrenderer/textlineshelper.hxx
@@ -20,13 +20,13 @@ namespace com::sun::star::rendering
class XPolyPolygon2D;
}
-namespace cppcanvas
-{
-namespace tools
+namespace cppcanvastools
{
struct TextLineInfo;
}
+namespace cppcanvas
+{
namespace internal
{
struct OutDevState;
@@ -59,7 +59,7 @@ public:
/** Init textlines with specified linewidth and TextLineInfo.
*/
- void init(double nLineWidth, const tools::TextLineInfo& rLineInfo);
+ void init(double nLineWidth, const cppcanvastools::TextLineInfo&
rLineInfo);
/** Fill the textlines with colors.
OutDevState::textUnderlineColor.
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index 95d6a0950274..8aa458f4cf02 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -146,11 +146,11 @@ namespace cppcanvas::internal
maDstSize(rDstSize.getX(), rDstSize.getY()),
mpCanvas( rCanvas )
{
- tools::initRenderState(maState,rState);
+ cppcanvastools::initRenderState(maState,rState);
implSetupTransform( maState, rDstPoint );
// correct clip (which is relative to original transform)
- tools::modifyClip( maState,
+ cppcanvastools::modifyClip( maState,
rState,
rCanvas,
rDstPoint,
@@ -468,7 +468,7 @@ namespace cppcanvas::internal
rendering::RenderState aLocalState( maState );
::canvastools::prependToRenderState(aLocalState,
rTransformation);
- return tools::calcDevicePixelBounds(
+ return cppcanvastools::calcDevicePixelBounds(
::basegfx::B2DRange( 0,0,
maDstSize.getWidth(),
maDstSize.getHeight() ),
diff --git a/cppcanvas/source/tools/tools.cxx b/cppcanvas/source/tools/tools.cxx
index d6775ba947d3..54be71bcfc71 100644
--- a/cppcanvas/source/tools/tools.cxx
+++ b/cppcanvas/source/tools/tools.cxx
@@ -23,22 +23,22 @@
using namespace ::com::sun::star;
-namespace cppcanvas::tools
+namespace cppcanvastools
{
- uno::Sequence< double > intSRGBAToDoubleSequence( IntSRGBA aColor )
+ uno::Sequence< double > intSRGBAToDoubleSequence( cppcanvas::IntSRGBA
aColor )
{
uno::Sequence< double > aRes{
- getRed(aColor) / 255.0,
- getGreen(aColor) / 255.0,
- getBlue(aColor) / 255.0,
- getAlpha(aColor) / 255.0
+ cppcanvas::getRed(aColor) / 255.0,
+ cppcanvas::getGreen(aColor) / 255.0,
+ cppcanvas::getBlue(aColor) / 255.0,
+ cppcanvas::getAlpha(aColor) / 255.0
};
return aRes;
}
- IntSRGBA doubleSequenceToIntSRGBA( const uno::Sequence< double >&
rColor )
+ cppcanvas::IntSRGBA doubleSequenceToIntSRGBA( const uno::Sequence<
double >& rColor )
{
- return makeColor( static_cast<sal_uInt8>( 255*rColor[0] + .5 ),
+ return cppcanvas::makeColor( static_cast<sal_uInt8>( 255*rColor[0]
+ .5 ),
static_cast<sal_uInt8>( 255*rColor[1] + .5 ),
static_cast<sal_uInt8>( 255*rColor[2] + .5 ),
static_cast<sal_uInt8>( 255*rColor[3] + .5 ) );
diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx
b/cppcanvas/source/wrapper/implpolypolygon.cxx
index 412248f038d4..7d66738e8f60 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.cxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.cxx
@@ -59,19 +59,19 @@ namespace cppcanvas::internal
void ImplPolyPolygon::setRGBAFillColor( IntSRGBA aColor )
{
- maFillColor = tools::intSRGBAToDoubleSequence( aColor );
+ maFillColor = cppcanvastools::intSRGBAToDoubleSequence( aColor );
mbFillColorSet = true;
}
void ImplPolyPolygon::setRGBALineColor( IntSRGBA aColor )
{
- maStrokeColor = tools::intSRGBAToDoubleSequence( aColor );
+ maStrokeColor = cppcanvastools::intSRGBAToDoubleSequence( aColor );
mbStrokeColorSet = true;
}
IntSRGBA ImplPolyPolygon::getRGBALineColor() const
{
- return tools::doubleSequenceToIntSRGBA( maStrokeColor );
+ return cppcanvastools::doubleSequenceToIntSRGBA( maStrokeColor );
}
void ImplPolyPolygon::setStrokeWidth( const double& rStrokeWidth )
