0001-WIP-postuserevent.patch | 404
0001-WIP.patch | 70
0001-convert-XML_NAMESPACE_-to-scoped-enum.patch |35959
++++++++++
accessibility/inc/extended/AccessibleBrowseBox.hxx | 6
accessibility/inc/extended/AccessibleBrowseBoxBase.hxx | 14
accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx | 10
accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx | 4
accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx | 2
accessibility/inc/extended/accessiblebrowseboxcell.hxx | 2
accessibility/inc/extended/accessibletablistbox.hxx | 2
accessibility/source/extended/AccessibleBrowseBox.cxx | 12
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 24
accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx | 2
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 2
accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx | 2
accessibility/source/extended/AccessibleBrowseBoxTable.cxx | 2
accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx | 2
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx | 4
accessibility/source/extended/accessiblebrowseboxcell.cxx | 4
accessibility/source/extended/accessibletablistbox.cxx | 2
accessibility/source/helper/acc_factory.cxx | 8
compilerplugins/clang/constantparam.numbers.results | 4
dbaccess/source/ui/browser/sbagrid.cxx | 4
dbaccess/source/ui/inc/sbagrid.hxx | 2
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 4
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 2
include/svtools/brwbox.hxx | 6
include/svx/fmgridcl.hxx | 4
include/vcl/AccessibleBrowseBoxObjType.hxx | 29
include/vcl/accessiblefactory.hxx | 4
include/vcl/accessibletableprovider.hxx | 8
include/vcl/toolkit/svtabbx.hxx | 6
n1 | 7024 +
notes1 | 5
pattern1.diff | 112
secmod.db |binary
svtools/source/brwbox/brwbox1.cxx | 12
svtools/source/brwbox/brwbox3.cxx | 66
svtools/source/brwbox/brwimpl.hxx | 2
svx/source/fmcomp/fmgridcl.cxx | 12
temp.diff | 108
vcl/source/helper/svtaccessiblefactory.cxx | 4
vcl/source/treelist/svtabbx.cxx | 40
43 files changed, 43834 insertions(+), 161 deletions(-)
New commits:
commit c2d73de5b5e22e20bc77ee0a27d1c381119c4c79
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jul 2 11:26:25 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jul 2 12:37:25 2021 +0200
convert AccessibleBrowseBoxObjType to scoped enum
Change-Id: Iaf764c905d080e4decabd853bd3847b34cb79cdd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118279
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/0001-WIP-postuserevent.patch b/0001-WIP-postuserevent.patch
new file mode 100644
index 000000000000..af323002ae54
--- /dev/null
+++ b/0001-WIP-postuserevent.patch
@@ -0,0 +1,404 @@
+From fc1bf70b9c42187a3d5300e5fd6122e065fcb6c6 Mon Sep 17 00:00:00 2001
+From: Noel Grandin <noel.gran...@collabora.co.uk>
+Date: Mon, 8 Jun 2020 16:13:58 +0200
+Subject: [PATCH] WIP postuserevent
+
+Change-Id: I25e15d1dd8b37d6aa0d219d94a78739d6106737d
+---
+ include/vcl/svapp.hxx | 23 +++++++++++++++++--
+ svtools/source/hatchwindow/documentcloser.cxx | 2 +-
+ .../source/uno/generictoolboxcontroller.cxx | 2 +-
+ .../source/uno/popupmenucontrollerbase.cxx | 2 +-
+ .../core/docnode/retrievedinputstreamdata.cxx | 4 +---
+ sw/source/ui/dbui/mmoutputtypepage.cxx | 23 +++++++++----------
+ sw/source/ui/inc/mmresultdialogs.hxx | 6 +++--
+ vcl/qt5/Qt5Menu.cxx | 2 +-
+ vcl/source/app/svapp.cxx | 12 +++++-----
+ vcl/source/gdi/print3.cxx | 2 +-
+ vcl/source/window/menubarwindow.cxx | 2 +-
+ vcl/source/window/winproc.cxx | 4 ++--
+ vcl/unx/generic/app/sm.cxx | 8 +++----
+ vcl/unx/gtk3/fpicker/SalGtkPicker.cxx | 2 +-
+ vcl/unx/gtk3/gtk3gtkinst.cxx | 2 +-
+ vcl/unx/gtk3/gtk3gtksalmenu.cxx | 2 +-
+ 16 files changed, 58 insertions(+), 40 deletions(-)
+
+diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
+index 48a764b80125..8ea95b97deb9 100644
+--- a/include/vcl/svapp.hxx
++++ b/include/vcl/svapp.hxx
+@@ -772,8 +772,10 @@ public:
+ @param bReferenceLink If true - hold a VclPtr<> reference on the
Link's instance.
+ Taking the reference is guarded by a
SolarMutexGuard.
+
+- @return the event ID used to post the event.
++ @return the event ID used to post the event. This event id MUST be
saved, and destroyed
++ via RemoveUserEvent if the owning class dies before the event is
processed.
+ */
++ [[nodiscard]]
+ static ImplSVEvent * PostUserEvent( const Link<void*,void>& rLink, void*
pCaller = nullptr,
+ bool bReferenceLink = false );
+
+@@ -1453,9 +1455,26 @@ VCL_DLLPUBLIC void SetSVWinData(ImplSVWinData*);
+
+ inline void Application::EndYield()
+ {
+- PostUserEvent( Link<void*,void>() );
++ (void) PostUserEvent( Link<void*,void>() );
+ }
+
++/**
++ Declare an instance of this per user-event you need to post via
Application::PostEvent,
++ and assign the result of that function to this, and this will remove
++ that event if your class dies before the event is processed.
++*/
++class UserEventCleaner
++{
++ ImplSVEvent* mpEvent;
++public:
++ void operator=(ImplSVEvent* p) { mpEvent = p; }
++ ~UserEventCleaner()
++ {
++ if (mpEvent)
++ Application::RemoveUserEvent(mpEvent);
++ }
++};
++
+ #endif // _APP_HXX
+
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+diff --git a/svtools/source/hatchwindow/documentcloser.cxx
b/svtools/source/hatchwindow/documentcloser.cxx
+index 6e014dd7ea46..b8fbc5dc6e14 100644
+--- a/svtools/source/hatchwindow/documentcloser.cxx
++++ b/svtools/source/hatchwindow/documentcloser.cxx
+@@ -89,7 +89,7 @@ void MainThreadFrameCloserRequest::Start(
MainThreadFrameCloserRequest* pMTReque
+ worker( nullptr, pMTRequest );
+ }
+ else
+- Application::PostUserEvent( LINK( nullptr,
MainThreadFrameCloserRequest, worker ), pMTRequest );
++ (void) Application::PostUserEvent( LINK( nullptr,
MainThreadFrameCloserRequest, worker ), pMTRequest );
+ }
+ }
+
+diff --git a/svtools/source/uno/generictoolboxcontroller.cxx
b/svtools/source/uno/generictoolboxcontroller.cxx
+index 570805632b53..7423e6aa3f17 100644
+--- a/svtools/source/uno/generictoolboxcontroller.cxx
++++ b/svtools/source/uno/generictoolboxcontroller.cxx
+@@ -135,7 +135,7 @@ void SAL_CALL GenericToolboxController::execute( sal_Int16
/*KeyModifier*/ )
+ pExecuteInfo->xDispatch = xDispatch;
+ pExecuteInfo->aTargetURL = aTargetURL;
+ pExecuteInfo->aArgs = aArgs;
+- Application::PostUserEvent( LINK(nullptr, GenericToolboxController ,
ExecuteHdl_Impl), pExecuteInfo );
++ (void) Application::PostUserEvent( LINK(nullptr, GenericToolboxController
, ExecuteHdl_Impl), pExecuteInfo );
+ }
+
+ void GenericToolboxController::statusChanged( const FeatureStateEvent& Event )
+diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx
b/svtools/source/uno/popupmenucontrollerbase.cxx
+index 9ce0bda33a63..56ab79194b67 100644
+--- a/svtools/source/uno/popupmenucontrollerbase.cxx
++++ b/svtools/source/uno/popupmenucontrollerbase.cxx
+@@ -141,7 +141,7 @@ void PopupMenuControllerBase::dispatchCommand( const
OUString& sCommandURL,
+
+ Reference< XDispatch > xDispatch( xDispatchProvider->queryDispatch(
aURL, sTarget, 0 ), UNO_SET_THROW );
+
+- Application::PostUserEvent( LINK(nullptr, PopupMenuControllerBase,
ExecuteHdl_Impl), new PopupMenuControllerBaseDispatchInfo( xDispatch, aURL,
rArgs ) );
++ (void) Application::PostUserEvent( LINK(nullptr,
PopupMenuControllerBase, ExecuteHdl_Impl), new
PopupMenuControllerBaseDispatchInfo( xDispatch, aURL, rArgs ) );
+
+ }
+ catch( Exception& )
+diff --git a/sw/source/core/docnode/retrievedinputstreamdata.cxx
b/sw/source/core/docnode/retrievedinputstreamdata.cxx
+index b41125698981..b92b2574af34 100644
+--- a/sw/source/core/docnode/retrievedinputstreamdata.cxx
++++ b/sw/source/core/docnode/retrievedinputstreamdata.cxx
+@@ -134,10 +134,8 @@ IMPL_LINK( SwRetrievedInputStreamDataManager,
+
+ osl::MutexGuard aGuard(maMutex);
+
+- SwRetrievedInputStreamDataManager& rDataManager =
+- SwRetrievedInputStreamDataManager::GetManager();
+ SwRetrievedInputStreamDataManager::tData aInputStreamData;
+- if ( rDataManager.PopData( *pDataKey, aInputStreamData ) )
++ if ( PopData( *pDataKey, aInputStreamData ) )
+ {
+ std::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer >
pThreadConsumer =
+ aInputStreamData.mpThreadConsumer.lock();
+diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx
b/sw/source/ui/dbui/mmoutputtypepage.cxx
+index f7153c3bc503..7f9b4c144bed 100644
+--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
++++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
+@@ -309,9 +309,9 @@ IMPL_LINK_NOARG(SwSendMailDialog, CloseHdl_Impl,
weld::Button&, void)
+ }
+ }
+
+-IMPL_STATIC_LINK( SwSendMailDialog, StartSendMails, void*, pDialog, void )
++IMPL_LINK( SwSendMailDialog, StartSendMails, void*, /*pDialog*/, void )
+ {
+- static_cast<SwSendMailDialog*>(pDialog)->SendMails();
++ SendMails();
+ }
+
+ IMPL_LINK( SwSendMailDialog, RemoveThis, Timer*, pTimer, void )
+@@ -336,15 +336,14 @@ IMPL_LINK( SwSendMailDialog, RemoveThis, Timer*, pTimer,
void )
+ }
+ }
+
+-IMPL_STATIC_LINK( SwSendMailDialog, StopSendMails, void*, p, void )
++IMPL_LINK( SwSendMailDialog, StopSendMails, void*, /*p*/, void )
+ {
+- SwSendMailDialog* pDialog = static_cast<SwSendMailDialog*>(p);
+- if(pDialog->m_pImpl->xMailDispatcher.is() &&
+- pDialog->m_pImpl->xMailDispatcher->isStarted())
++ if(m_pImpl->xMailDispatcher.is() &&
++ m_pImpl->xMailDispatcher->isStarted())
+ {
+- pDialog->m_pImpl->xMailDispatcher->stop();
+- pDialog->m_xStop->set_label(pDialog->m_sContinue);
+- pDialog->m_xPaused->show();
++ m_pImpl->xMailDispatcher->stop();
++ m_xStop->set_label(m_sContinue);
++ m_xPaused->show();
+ }
+ }
+
+@@ -452,7 +451,7 @@ void SwSendMailDialog::IterateMails()
+
+ void SwSendMailDialog::StartSend(sal_Int32 nExpectedCount)
+ {
+- Application::PostUserEvent( LINK( this, SwSendMailDialog,
++ m_StartSendUserEvent = Application::PostUserEvent( LINK( this,
SwSendMailDialog,
+ StartSendMails ), this );
+ m_nExpectedCount = nExpectedCount > 0 ? nExpectedCount : 1;
+ }
+@@ -465,8 +464,8 @@ void SwSendMailDialog::DocumentSent( uno::Reference<
mail::XMailMessage> const &
+ if(pError &&
+ m_pImpl->xMailDispatcher.is() &&
m_pImpl->xMailDispatcher->isStarted())
+ {
+- Application::PostUserEvent( LINK( this, SwSendMailDialog,
+- StopSendMails ), this );
++ m_StopSendUserEvent = Application::PostUserEvent( LINK( this,
SwSendMailDialog,
++ StopSendMails ), this );
+ }
+ OUString sInsertImg(bResult ? OUString(RID_BMP_FORMULA_APPLY) :
OUString(RID_BMP_FORMULA_CANCEL));
+
+diff --git a/sw/source/ui/inc/mmresultdialogs.hxx
b/sw/source/ui/inc/mmresultdialogs.hxx
+index 4db8e0e766f4..402c1324cbaf 100644
+--- a/sw/source/ui/inc/mmresultdialogs.hxx
++++ b/sw/source/ui/inc/mmresultdialogs.hxx
+@@ -150,6 +150,8 @@ class SwSendMailDialog : public
weld::GenericDialogController
+ sal_Int32 m_nExpectedCount;
+ sal_Int32 m_nSendCount;
+ sal_Int32 m_nErrorCount;
++ UserEventCleaner m_StartSendUserEvent;
++ UserEventCleaner m_StopSendUserEvent;
+
+ std::unique_ptr<weld::Label> m_xTransferStatus;
+ std::unique_ptr<weld::Label> m_xPaused;
+@@ -162,8 +164,8 @@ class SwSendMailDialog : public
weld::GenericDialogController
+
+ DECL_LINK( StopHdl_Impl, weld::Button&, void );
+ DECL_LINK( CloseHdl_Impl, weld::Button& , void);
+- DECL_STATIC_LINK( SwSendMailDialog, StartSendMails, void*, void );
+- DECL_STATIC_LINK( SwSendMailDialog, StopSendMails, void*, void );
++ DECL_LINK( StartSendMails, void*, void );
++ DECL_LINK( StopSendMails, void*, void );
+ DECL_LINK( RemoveThis, Timer*, void );
+
+ void IterateMails();
+diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
+index 98615247035a..c875ca5154a5 100644
+--- a/vcl/qt5/Qt5Menu.cxx
++++ b/vcl/qt5/Qt5Menu.cxx
+@@ -634,7 +634,7 @@ void Qt5Menu::slotCloseDocument()
+ {
+ MenuBar* pVclMenuBar = static_cast<MenuBar*>(mpVCLMenu.get());
+ if (pVclMenuBar)
+- Application::PostUserEvent(pVclMenuBar->GetCloseButtonClickHdl());
++
(void)Application::PostUserEvent(pVclMenuBar->GetCloseButtonClickHdl());
+ }
+
+ void Qt5Menu::ShowCloseButton(bool bShow)
+diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
+index ea01d31c0829..3d4f9ac2794e 100644
+--- a/vcl/source/app/svapp.cxx
++++ b/vcl/source/app/svapp.cxx
+@@ -313,12 +313,12 @@ IMPL_STATIC_LINK_NOARG( ImplSVAppData,
ImplEndAllDialogsMsg, void*, void )
+
+ void Application::EndAllDialogs()
+ {
+- Application::PostUserEvent( LINK( nullptr, ImplSVAppData,
ImplEndAllDialogsMsg ) );
++ (void) Application::PostUserEvent( LINK( nullptr, ImplSVAppData,
ImplEndAllDialogsMsg ) );
+ }
+
+ void Application::EndAllPopups()
+ {
+- Application::PostUserEvent( LINK( nullptr, ImplSVAppData,
ImplEndAllPopupsMsg ) );
++ (void) Application::PostUserEvent( LINK( nullptr, ImplSVAppData,
ImplEndAllPopupsMsg ) );
+ }
+
+
+@@ -369,7 +369,7 @@ namespace
+ {
+ Application::EndAllPopups();
+ Application::EndAllDialogs();
+- Application::PostUserEvent( LINK( nullptr, ImplSVAppData,
ImplPrepareExitMsg ) );
++ (void) Application::PostUserEvent( LINK( nullptr, ImplSVAppData,
ImplPrepareExitMsg ) );
+ }
+ }
+
+@@ -381,7 +381,7 @@ IMPL_LINK_NOARG(ImplSVAppData, VclEventTestingHdl, Timer
*, void)
+ }
+ else
+ {
+- Application::PostUserEvent( LINK( nullptr, ImplSVAppData,
ImplVclEventTestingHdl ) );
++ (void) Application::PostUserEvent( LINK( nullptr, ImplSVAppData,
ImplVclEventTestingHdl ) );
+ }
+ }
+
+@@ -404,7 +404,7 @@ IMPL_STATIC_LINK_NOARG( ImplSVAppData,
ImplVclEventTestingHdl, void*, void )
+ SAL_INFO("vcl.eventtesting", "Event Input exhausted, exit next
cycle");
+ pSVData->maAppData.mnEventTestLimit = 0;
+ }
+- Application::PostUserEvent( LINK( nullptr, ImplSVAppData,
ImplVclEventTestingHdl ) );
++ (void) Application::PostUserEvent( LINK( nullptr, ImplSVAppData,
ImplVclEventTestingHdl ) );
+ }
+ }
+
+@@ -527,7 +527,7 @@ IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplQuitMsg, void*,
void )
+ void Application::Quit()
+ {
+ ImplGetSVData()->maAppData.mbAppQuit = true;
+- Application::PostUserEvent( LINK( nullptr, ImplSVAppData, ImplQuitMsg ) );
++ (void) Application::PostUserEvent( LINK( nullptr, ImplSVAppData,
ImplQuitMsg ) );
+ }
+
+ comphelper::SolarMutex& Application::GetSolarMutex()
+diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
+index cb326ae9d31a..1bbee35c6961 100644
+--- a/vcl/source/gdi/print3.cxx
++++ b/vcl/source/gdi/print3.cxx
+@@ -313,7 +313,7 @@ void Printer::PrintJob(const
std::shared_ptr<PrinterController>& i_xController,
+ else
+ {
+ PrintJobAsync* pAsync = new PrintJobAsync(i_xController,
i_rInitSetup);
+- Application::PostUserEvent( LINK( pAsync, PrintJobAsync, ExecJob ) );
++ (void) Application::PostUserEvent( LINK( pAsync, PrintJobAsync,
ExecJob ) );
+ }
+ }
+
+diff --git a/vcl/source/window/menubarwindow.cxx
b/vcl/source/window/menubarwindow.cxx
+index 41a51b79ce5b..cead833427fb 100644
+--- a/vcl/source/window/menubarwindow.cxx
++++ b/vcl/source/window/menubarwindow.cxx
+@@ -226,7 +226,7 @@ IMPL_LINK_NOARG(MenuBarWindow, CloseHdl, ToolBox *, void)
+ // #i106052# call close hdl asynchronously to ease handler
implementation
+ // this avoids still being in the handler while the DecoToolBox
already
+ // gets destroyed
+-
Application::PostUserEvent(static_cast<MenuBar*>(m_pMenu.get())->GetCloseButtonClickHdl());
++ (void)
Application::PostUserEvent(static_cast<MenuBar*>(m_pMenu.get())->GetCloseButtonClickHdl());
+ }
+ else
+ {
+diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
+index 57bba25eb16b..300bd12e3432 100644
+--- a/vcl/source/window/winproc.cxx
++++ b/vcl/source/window/winproc.cxx
+@@ -787,7 +787,7 @@ bool ImplHandleMouseEvent( const VclPtr<vcl::Window>&
xWindow, MouseNotifyEvent
+ ContextMenuEvent* pEv = new ContextMenuEvent;
+ pEv->pWindow = pChild;
+ pEv->aChildPos = aChildPos;
+- Application::PostUserEvent( Link<void*,void>( pEv,
ContextMenuEventLink ) );
++ (void) Application::PostUserEvent( Link<void*,void>(
pEv, ContextMenuEventLink ) );
+ }
+ else
+ bRet = ! ImplCallCommand( pChild,
CommandEventId::ContextMenu, nullptr, true, &aChildPos );
+@@ -1986,7 +1986,7 @@ static void ImplHandleClose( const vcl::Window* pWindow )
+ {
+ DelayedCloseEvent* pEv = new DelayedCloseEvent;
+ pEv->pWindow = pWin;
+- Application::PostUserEvent( Link<void*,void>( pEv,
DelayedCloseEventLink ) );
++ (void) Application::PostUserEvent( Link<void*,void>( pEv,
DelayedCloseEventLink ) );
+ }
+ }
+
+diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
+index 30ff437a263a..9a1f02fc7bac 100644
+--- a/vcl/unx/generic/app/sm.cxx
++++ b/vcl/unx/generic/app/sm.cxx
+@@ -383,7 +383,7 @@ void SessionManagerClient::SaveYourselfProc(
+ }
+ // Smuggle argument in as void*:
+ sal_uIntPtr nStateVal = shutdown;
+- Application::PostUserEvent( LINK( nullptr, SessionManagerClient,
SaveYourselfHdl ), reinterpret_cast< void * >(nStateVal) );
++ (void) Application::PostUserEvent( LINK( nullptr, SessionManagerClient,
SaveYourselfHdl ), reinterpret_cast< void * >(nStateVal) );
+ }
+
+ IMPL_STATIC_LINK_NOARG( SessionManagerClient, ShutDownHdl, void*, void )
+@@ -412,7 +412,7 @@ void SessionManagerClient::DieProc(
+ if( connection == m_pSmcConnection )
+ {
+ SAL_INFO("vcl.sm.debug", " connection == m_pSmcConnection" );
+- Application::PostUserEvent( LINK( nullptr, SessionManagerClient,
ShutDownHdl ) );
++ (void) Application::PostUserEvent( LINK( nullptr,
SessionManagerClient, ShutDownHdl ) );
+ }
+ }
+
+@@ -432,7 +432,7 @@ void SessionManagerClient::ShutdownCanceledProc(
+
+ SAL_INFO("vcl.sm.debug", " connection == m_pSmcConnection = " << ((
connection == m_pSmcConnection ) ? "true" : "false"));
+ if( connection == m_pSmcConnection )
+- Application::PostUserEvent( LINK( nullptr, SessionManagerClient,
ShutDownCancelHdl ) );
++ (void) Application::PostUserEvent( LINK( nullptr,
SessionManagerClient, ShutDownCancelHdl ) );
+ }
+
+ void SessionManagerClient::InteractProc(
+@@ -443,7 +443,7 @@ void SessionManagerClient::InteractProc(
+
+ SAL_INFO("vcl.sm.debug", " connection == m_pSmcConnection = " << ((
connection == m_pSmcConnection ) ? "true" : "false"));
+ if( connection == m_pSmcConnection )
+- Application::PostUserEvent( LINK( nullptr, SessionManagerClient,
InteractionHdl ) );
++ (void) Application::PostUserEvent( LINK( nullptr,
SessionManagerClient, InteractionHdl ) );
+ }
+
+ void SessionManagerClient::saveDone()
+diff --git a/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx
b/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx
+index c847774d13d3..2b54c74d1fea 100644
+--- a/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx
++++ b/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx
+@@ -196,7 +196,7 @@ gint RunDialog::run()
+ if (mbTerminateDesktop)
+ {
+ ExecuteInfo* pExecuteInfo = new ExecuteInfo(mxDesktop);
+- Application::PostUserEvent(LINK(nullptr, RunDialog,
TerminateDesktop), pExecuteInfo);
++ (void) Application::PostUserEvent(LINK(nullptr, RunDialog,
TerminateDesktop), pExecuteInfo);
+ }
+
+ return nStatus;
+diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
+index fe4d84a7397d..0dfccdd202c5 100644
+--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
++++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
+@@ -9459,7 +9459,7 @@ private:
+ {
+ GtkInstanceTreeView* pThis =
static_cast<GtkInstanceTreeView*>(widget);
+ if (!pThis->signal_cell_editing_started(path))
+- Application::PostUserEvent(LINK(pThis, GtkInstanceTreeView,
async_stop_cell_editing));
++ (void) Application::PostUserEvent(LINK(pThis,
GtkInstanceTreeView, async_stop_cell_editing));
+ }
+
+ bool signal_cell_editing_started(const gchar *path)
+diff --git a/vcl/unx/gtk3/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+index 13a7ef2d30ac..6fc0644ffbbf 100644
+--- a/vcl/unx/gtk3/gtk3gtksalmenu.cxx
++++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+@@ -636,7 +636,7 @@ void GtkSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem,
SalMenu* pSubMenu, unsig
+
+ static void CloseMenuBar(GtkWidget *, gpointer pMenu)
+ {
+-
Application::PostUserEvent(static_cast<MenuBar*>(pMenu)->GetCloseButtonClickHdl());
++ (void)
Application::PostUserEvent(static_cast<MenuBar*>(pMenu)->GetCloseButtonClickHdl());
+ }
+
+ void GtkSalMenu::ShowCloseButton(bool bShow)
+--
+2.26.2
+
diff --git a/0001-WIP.patch b/0001-WIP.patch
new file mode 100644
index 000000000000..548ba4110638
--- /dev/null
+++ b/0001-WIP.patch
@@ -0,0 +1,70 @@
+From a91d8cdb19176ad356bce06ab2c0834f9ed5fe91 Mon Sep 17 00:00:00 2001
+From: Noel Grandin <noel.gran...@collabora.co.uk>
+Date: Sun, 20 Jun 2021 20:19:28 +0200
+Subject: [PATCH] WIP
+
+Change-Id: I4410d066b8a4d2fd2eb746a5dd8f4ee763a8aa3e
+---
+ sal/rtl/bootstrap.cxx | 33 ++++++++++++++++++++++++---------
+ 1 file changed, 24 insertions(+), 9 deletions(-)
+
+diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
+index 45c330a56edb..bb7fe573376d 100644
+--- a/sal/rtl/bootstrap.cxx
++++ b/sal/rtl/bootstrap.cxx
+@@ -37,6 +37,7 @@
+ #include <rtl/malformeduriexception.hxx>
+ #include <rtl/uri.hxx>
+ #include <sal/log.hxx>
++#include <o3tl/lru_map.hxx>
+
+ #include <vector>
+ #include <algorithm>
+@@ -590,21 +591,35 @@ bootstrap_map_t bootstrap_map;
+
+ rtlBootstrapHandle SAL_CALL rtl_bootstrap_args_open(rtl_uString * pIniName)
+ {
+- OUString iniName( pIniName );
++ static o3tl::lru_map<OUString,OUString> fileUrlLookupCache(16);
++
++ OUString originalIniName( pIniName );
++ OUString iniName;
++
++ osl::ResettableMutexGuard guard(osl::Mutex::getGlobalMutex());
++ auto cacheIt = fileUrlLookupCache.find(originalIniName);
++ bool foundInCache = cacheIt != fileUrlLookupCache.end();
++ if (foundInCache)
++ iniName = cacheIt->second;
++ guard.clear();
+
+ // normalize path
+- FileStatus status(osl_FileStatus_Mask_FileURL);
+- DirectoryItem dirItem;
+- if (DirectoryItem::get(iniName, dirItem) != DirectoryItem::E_None ||
+- dirItem.getFileStatus(status) != DirectoryItem::E_None)
++ if (iniName.isEmpty())
+ {
+- return nullptr;
++ FileStatus status(osl_FileStatus_Mask_FileURL);
++ DirectoryItem dirItem;
++ if (DirectoryItem::get(iniName, dirItem) != DirectoryItem::E_None ||
++ dirItem.getFileStatus(status) != DirectoryItem::E_None)
++ {
++ return nullptr;
++ }
++ iniName = status.getFileURL();
+ }
+
+- iniName = status.getFileURL();
+-
++ guard.reset();
++ if (!foundInCache)
++ fileUrlLookupCache.insert({originalIniName, iniName});
+ Bootstrap_Impl * that;
+- osl::ResettableMutexGuard guard(osl::Mutex::getGlobalMutex());
+ auto iFind(bootstrap_map.find(iniName));
+ if (iFind == bootstrap_map.end())
+ {
+--
+2.27.0
+
diff --git a/0001-convert-XML_NAMESPACE_-to-scoped-enum.patch
b/0001-convert-XML_NAMESPACE_-to-scoped-enum.patch
new file mode 100644
index 000000000000..24ef459abc43
--- /dev/null
+++ b/0001-convert-XML_NAMESPACE_-to-scoped-enum.patch
@@ -0,0 +1,35959 @@
+From 1ba78d2e2059eb53e80a3eeea384e4bb1896a34d Mon Sep 17 00:00:00 2001
+From: Noel Grandin <noel.gran...@collabora.co.uk>
+Date: Fri, 14 Aug 2020 09:19:30 +0200
+Subject: [PATCH] convert XML_NAMESPACE_ to scoped enum
+
+Change-Id: I7071cc0dd82d7e168aa033c155bfac7684e8f331
+---
+ dbaccess/source/filter/xml/xmlExport.cxx | 172 +--
+ dbaccess/source/filter/xml/xmlHelper.cxx | 66 +-
+ .../source/filter/xml/xmlTableFilterList.cxx | 4 +-
+ dbaccess/source/filter/xml/xmlfilter.cxx | 4 +-
+ .../source/misc/SvXMLAutoCorrectExport.cxx | 30 +-
+ .../misc/SvXMLAutoCorrectTokenHandler.hxx | 10 +-
+ editeng/source/xml/xmltxtimp.cxx | 4 +-
+ filter/source/svg/svgexport.cxx | 376 +++---
+ filter/source/svg/svgfontexport.cxx | 36 +-
+ filter/source/svg/svgwriter.cxx | 384 +++----
+ include/xmloff/SchXMLImportHelper.hxx | 2 +-
+ include/xmloff/XMLBase64ImportContext.hxx | 2 +-
+ include/xmloff/XMLShapeStyleContext.hxx | 2 +-
+ include/xmloff/maptype.hxx | 5 +-
+ include/xmloff/nmspmap.hxx | 22 +-
+ include/xmloff/numehelp.hxx | 6 +-
+ include/xmloff/prstylei.hxx | 2 +-
+ include/xmloff/shapeimport.hxx | 14 +-
+ include/xmloff/xmlexp.hxx | 17 +-
+ include/xmloff/xmlictxt.hxx | 4 +-
+ include/xmloff/xmlimp.hxx | 10 +-
+ include/xmloff/xmlnmspe.hxx | 175 +--
+ include/xmloff/xmlnumfi.hxx | 2 +-
+ include/xmloff/xmlprcon.hxx | 6 +-
+ include/xmloff/xmlprmap.hxx | 7 +-
+ include/xmloff/xmlstyle.hxx | 2 +-
+ include/xmloff/xmltkmap.hxx | 12 +-
+ linguistic/source/convdicxml.cxx | 32 +-
+ linguistic/source/convdicxml.hxx | 6 +-
+ reportdesign/source/filter/xml/xmlExport.cxx | 192 ++--
+ reportdesign/source/filter/xml/xmlHelper.cxx | 52 +-
+ .../filter/xml/xmlImportDocumentHandler.cxx | 4 +-
+ reportdesign/source/filter/xml/xmlfilter.cxx | 28 +-
+ sc/source/core/tool/interpr7.cxx | 2 +-
+ .../xml/XMLChangeTrackingExportHelper.cxx | 160 +--
+ .../filter/xml/XMLColumnRowGroupExport.cxx | 4 +-
+ sc/source/filter/xml/XMLExportDDELinks.cxx | 38 +-
+ sc/source/filter/xml/XMLExportDataPilot.cxx | 236 ++--
+ .../filter/xml/XMLExportDatabaseRanges.cxx | 142 +--
+ .../filter/xml/XMLStylesExportHelper.cxx | 50 +-
+ .../xml/XMLTableHeaderFooterContext.cxx | 8 +-
+ .../filter/xml/XMLTableMasterPageExport.cxx | 10 +-
+ .../filter/xml/XMLTableShapeImportHelper.cxx | 8 +-
+ .../filter/xml/XMLTrackedChangesContext.cxx | 6 +-
+ sc/source/filter/xml/editattributemap.cxx | 90 +-
+ sc/source/filter/xml/xmlannoi.cxx | 4 +-
+ sc/source/filter/xml/xmlbodyi.cxx | 2 +-
+ sc/source/filter/xml/xmlconti.cxx | 4 +-
+ sc/source/filter/xml/xmlexprt.cxx | 692 ++++++------
+ sc/source/filter/xml/xmlimprt.cxx | 126 +--
+ sc/source/filter/xml/xmlstyle.cxx | 170 +--
+ sc/source/filter/xml/xmlstyli.cxx | 12 +-
+ starmath/source/mathmlexport.cxx | 198 ++--
+ starmath/source/mathmlimport.cxx | 38 +-
+ svx/source/xml/xmlxtexp.cxx | 18 +-
+ svx/source/xml/xmlxtimp.cxx | 36 +-
+ sw/source/core/inc/SwXMLBlockImport.hxx | 24 +-
+ sw/source/core/swg/SwXMLBlockExport.cxx | 54 +-
+ sw/source/core/swg/SwXMLSectionList.cxx | 4 +-
+ sw/source/core/swg/SwXMLTextBlocks1.cxx | 10 +-
+ sw/source/filter/xml/xmlbrsh.cxx | 28 +-
+ sw/source/filter/xml/xmlexp.cxx | 8 +-
+ sw/source/filter/xml/xmlexpit.cxx | 10 +-
+ sw/source/filter/xml/xmlfmt.cxx | 12 +-
+ sw/source/filter/xml/xmlfmte.cxx | 16 +-
+ sw/source/filter/xml/xmlimp.cxx | 18 +-
+ sw/source/filter/xml/xmlimpit.cxx | 4 +-
+ sw/source/filter/xml/xmlitemi.cxx | 2 +-
+ sw/source/filter/xml/xmlitemm.cxx | 8 +-
+ sw/source/filter/xml/xmlmeta.cxx | 2 +-
+ sw/source/filter/xml/xmltble.cxx | 68 +-
+ sw/source/filter/xml/xmltbli.cxx | 74 +-
+ sw/source/filter/xml/xmltexte.cxx | 42 +-
+ .../uibase/config/StoredChapterNumbering.cxx | 60 +-
+ unoxml/source/dom/document.cxx | 2 +-
+ xmloff/inc/DomBuilderContext.hxx | 6 +-
+ xmloff/inc/XMLChartStyleContext.hxx | 2 +-
+ xmloff/inc/XMLElementPropertyContext.hxx | 2 +-
+ xmloff/inc/XMLEmbeddedObjectImportContext.hxx | 2 +-
+ xmloff/inc/XMLStringBufferImportContext.hxx | 4 +-
+ xmloff/inc/txtflde.hxx | 6 +-
+ xmloff/source/chart/PropertyMap.hxx | 42 +-
+ xmloff/source/chart/PropertyMaps.cxx | 6 +-
+ xmloff/source/chart/SchXMLAxisContext.cxx | 54 +-
+ xmloff/source/chart/SchXMLAxisContext.hxx | 2 +-
+ .../SchXMLCalculationSettingsContext.cxx | 8 +-
+ .../SchXMLCalculationSettingsContext.hxx | 4 +-
+ xmloff/source/chart/SchXMLChartContext.cxx | 26 +-
+ xmloff/source/chart/SchXMLChartContext.hxx | 4 +-
+ xmloff/source/chart/SchXMLExport.cxx | 272 ++---
+ xmloff/source/chart/SchXMLImport.cxx | 154 +--
+ xmloff/source/chart/SchXMLLegendContext.cxx | 26 +-
+ .../source/chart/SchXMLParagraphContext.cxx | 12 +-
+ .../source/chart/SchXMLParagraphContext.hxx | 2 +-
+ xmloff/source/chart/SchXMLPlotAreaContext.cxx | 56 +-
+ xmloff/source/chart/SchXMLPlotAreaContext.hxx | 18 +-
+ .../chart/SchXMLPropertyMappingContext.cxx | 4 +-
+ .../SchXMLRegressionCurveObjectContext.cxx | 14 +-
+ .../SchXMLRegressionCurveObjectContext.hxx | 6 +-
+ xmloff/source/chart/SchXMLSeries2Context.cxx | 18 +-
+ xmloff/source/chart/SchXMLSeries2Context.hxx | 2 +-
+ xmloff/source/chart/SchXMLTableContext.cxx | 58 +-
+ xmloff/source/chart/SchXMLTableContext.hxx | 10 +-
+ xmloff/source/chart/SchXMLTextListContext.cxx | 16 +-
+ xmloff/source/chart/SchXMLTextListContext.hxx | 2 +-
+ xmloff/source/chart/SchXMLTools.cxx | 10 +-
+ .../source/chart/XMLChartPropertyContext.cxx | 4 +-
+ .../source/chart/XMLChartPropertyContext.hxx | 4 +-
+ xmloff/source/chart/XMLChartStyleContext.cxx | 4 +-
+ .../source/chart/XMLLabelSeparatorContext.cxx | 4 +-
+ .../source/chart/XMLLabelSeparatorContext.hxx | 4 +-
+ xmloff/source/chart/XMLSymbolImageContext.cxx | 14 +-
+ xmloff/source/chart/XMLSymbolImageContext.hxx | 4 +-
+ xmloff/source/chart/contexts.cxx | 8 +-
+ xmloff/source/chart/contexts.hxx | 4 +-
+ .../source/core/DocumentSettingsContext.cxx | 4 +-
+ xmloff/source/core/DomBuilderContext.cxx | 24 +-
+ xmloff/source/core/DomExport.cxx | 4 +-
+ xmloff/source/core/RDFaExportHelper.cxx | 8 +-
+ xmloff/source/core/RDFaImportHelper.cxx | 8 +-
+ xmloff/source/core/XMLBase64Export.cxx | 2 +-
+ xmloff/source/core/XMLBase64ImportContext.cxx | 2 +-
+ .../core/XMLEmbeddedObjectImportContext.cxx | 10 +-
+ xmloff/source/core/nmspmap.cxx | 44 +-
+ xmloff/source/core/xmlexp.cxx | 122 +-
+ xmloff/source/core/xmlictxt.cxx | 4 +-
+ xmloff/source/core/xmlimp.cxx | 232 ++--
+ xmloff/source/core/xmltkmap.cxx | 6 +-
+ xmloff/source/draw/QRCodeContext.cxx | 4 +-
+ .../source/draw/XMLGraphicsDefaultStyle.cxx | 8 +-
+ xmloff/source/draw/XMLImageMapContext.cxx | 36 +-
+ xmloff/source/draw/XMLImageMapExport.cxx | 46 +-
+ xmloff/source/draw/XMLNumberStyles.cxx | 18 +-
+ .../draw/XMLReplacementImageContext.cxx | 2 +-
+ xmloff/source/draw/XMLShapeStyleContext.cxx | 6 +-
+ xmloff/source/draw/animationexport.cxx | 146 +--
+ xmloff/source/draw/animationimport.cxx | 8 +-
+ xmloff/source/draw/animexp.cxx | 34 +-
+ xmloff/source/draw/eventimp.cxx | 20 +-
+ xmloff/source/draw/layerexp.cxx | 18 +-
+ xmloff/source/draw/layerimp.cxx | 6 +-
+ xmloff/source/draw/sdpropls.cxx | 476 ++++----
+ xmloff/source/draw/sdxmlexp.cxx | 168 +--
+ xmloff/source/draw/sdxmlimp.cxx | 50 +-
+ xmloff/source/draw/shapeexport.cxx | 590 +++++-----
+ xmloff/source/draw/shapeimport.cxx | 96 +-
+ xmloff/source/draw/ximp3dscene.cxx | 8 +-
+ xmloff/source/draw/ximpgrp.cxx | 6 +-
+ xmloff/source/draw/ximplink.cxx | 2 +-
+ xmloff/source/draw/ximppage.cxx | 14 +-
+ xmloff/source/draw/ximpshap.cxx | 132 +--
+ xmloff/source/draw/ximpstyl.cxx | 20 +-
+ xmloff/source/forms/controlpropertymap.cxx | 68 +-
+ xmloff/source/forms/elementexport.cxx | 30 +-
+ xmloff/source/forms/elementimport.cxx | 24 +-
+ xmloff/source/forms/formattributes.cxx | 14 +-
+ xmloff/source/forms/formattributes.hxx | 6 +-
+ xmloff/source/forms/formevents.cxx | 66 +-
+ xmloff/source/forms/layerimport.cxx | 2 +-
+ xmloff/source/forms/officeforms.cxx | 2 +-
+ xmloff/source/forms/property_description.hxx | 2 +-
+ xmloff/source/forms/property_meta_data.cxx | 2 +-
+ xmloff/source/forms/propertyexport.cxx | 18 +-
+ xmloff/source/forms/propertyimport.cxx | 10 +-
+ xmloff/source/meta/MetaExportComponent.cxx | 4 +-
+ xmloff/source/meta/xmlmetae.cxx | 78 +-
+ xmloff/source/meta/xmlversion.cxx | 24 +-
+ xmloff/source/script/XMLEventExport.cxx | 130 +--
+ xmloff/source/script/XMLEventImportHelper.cxx | 2 +-
+ .../source/script/XMLEventsImportContext.cxx | 2 +-
+ .../source/script/XMLScriptContextFactory.cxx | 2 +-
+ .../source/script/XMLScriptExportHandler.cxx | 12 +-
+ .../script/XMLStarBasicContextFactory.cxx | 2 +-
+ .../script/XMLStarBasicExportHandler.cxx | 12 +-
+ xmloff/source/script/xmlbasicscript.cxx | 16 +-
+ xmloff/source/script/xmlscripti.cxx | 2 +-
+ xmloff/source/style/DashStyle.cxx | 34 +-
+ xmloff/source/style/FillStyleContext.cxx | 2 +-
+ xmloff/source/style/GradientStyle.cxx | 48 +-
+ xmloff/source/style/HatchStyle.cxx | 28 +-
+ xmloff/source/style/ImageStyle.cxx | 26 +-
+ xmloff/source/style/MarkerStyle.cxx | 10 +-
+ .../source/style/PageHeaderFooterContext.cxx | 2 +-
+ .../source/style/PageMasterImportContext.cxx | 6 +-
+ xmloff/source/style/PageMasterStyleMap.cxx | 428 +++----
+ xmloff/source/style/TransGradientStyle.cxx | 38 +-
+ .../style/XMLBackgroundImageContext.cxx | 18 +-
+ .../source/style/XMLBackgroundImageExport.cxx | 14 +-
+ xmloff/source/style/XMLFontAutoStylePool.cxx | 32 +-
+ xmloff/source/style/XMLFontStylesContext.cxx | 24 +-
+ .../style/XMLFootnoteSeparatorExport.cxx | 16 +-
+ .../style/XMLFootnoteSeparatorImport.cxx | 2 +-
+ xmloff/source/style/XMLPageExport.cxx | 18 +-
+ xmloff/source/style/impastpl.cxx | 8 +-
+ xmloff/source/style/numehelp.cxx | 46 +-
+ xmloff/source/style/prstylei.cxx | 4 +-
+ xmloff/source/style/styleexp.cxx | 38 +-
+ xmloff/source/style/xmlaustp.cxx | 6 +-
+ xmloff/source/style/xmlexppr.cxx | 62 +-
+ xmloff/source/style/xmlimppr.cxx | 16 +-
+ xmloff/source/style/xmlnume.cxx | 100 +-
+ xmloff/source/style/xmlnumfe.cxx | 138 +--
+ xmloff/source/style/xmlnumfi.cxx | 168 +--
+ xmloff/source/style/xmlnumi.cxx | 84 +-
+ xmloff/source/style/xmlstyle.cxx | 36 +-
+ xmloff/source/style/xmltabe.cxx | 14 +-
+ xmloff/source/style/xmltabi.cxx | 12 +-
+ xmloff/source/table/XMLTableExport.cxx | 52 +-
+ xmloff/source/table/XMLTableImport.cxx | 26 +-
+ xmloff/source/text/XMLAutoMarkFileContext.cxx | 2 +-
+ .../text/XMLAutoTextContainerEventImport.cxx | 2 +-
+ xmloff/source/text/XMLAutoTextEventExport.cxx | 26 +-
+ .../text/XMLCalculationSettingsContext.cxx | 2 +-
+ .../text/XMLChangeElementImportContext.cxx | 2 +-
+ xmloff/source/text/XMLChangeImportContext.cxx | 2 +-
+ xmloff/source/text/XMLChangeInfoContext.cxx | 6 +-
+ .../text/XMLChangedRegionImportContext.cxx | 6 +-
+ .../XMLFootnoteConfigurationImportContext.cxx | 32 +-
+ .../source/text/XMLFootnoteImportContext.cxx | 10 +-
+ .../XMLIndexAlphabeticalSourceContext.cxx | 2 +-
+ ...LIndexBibliographyConfigurationContext.cxx | 10 +-
+ .../text/XMLIndexBibliographyEntryContext.cxx | 2 +-
+ .../XMLIndexBibliographySourceContext.cxx | 2 +-
+ .../text/XMLIndexChapterInfoEntryContext.cxx | 2 +-
+ .../XMLIndexIllustrationSourceContext.cxx | 2 +-
+ xmloff/source/text/XMLIndexMarkExport.cxx | 12 +-
+ .../text/XMLIndexObjectSourceContext.cxx | 2 +-
+ .../text/XMLIndexSimpleEntryContext.cxx | 2 +-
+ .../source/text/XMLIndexSourceBaseContext.cxx | 72 +-
+ xmloff/source/text/XMLIndexTOCContext.cxx | 8 +-
+ .../source/text/XMLIndexTOCSourceContext.cxx | 2 +-
+ .../source/text/XMLIndexTOCStylesContext.cxx | 6 +-
+ .../text/XMLIndexTabStopEntryContext.cxx | 2 +-
+ .../text/XMLIndexTableSourceContext.cxx | 2 +-
+ .../source/text/XMLIndexTemplateContext.cxx | 4 +-
+ .../text/XMLIndexTitleTemplateContext.cxx | 2 +-
+ .../source/text/XMLIndexUserSourceContext.cxx | 2 +-
+ xmloff/source/text/XMLLineNumberingExport.cxx | 26 +-
+ .../text/XMLLineNumberingImportContext.cxx | 28 +-
+ ...XMLLineNumberingSeparatorImportContext.cxx | 2 +-
+ xmloff/source/text/XMLRedlineExport.cxx | 38 +-
+ xmloff/source/text/XMLSectionExport.cxx | 148 +--
+ .../text/XMLSectionFootnoteConfigExport.cxx | 14 +-
+ .../text/XMLSectionFootnoteConfigImport.cxx | 4 +-
+ .../source/text/XMLSectionImportContext.cxx | 24 +-
+ .../text/XMLSectionSourceImportContext.cxx | 6 +-
+ .../text/XMLStringBufferImportContext.cxx | 4 +-
+ .../XMLTextCharStyleNamesElementExport.cxx | 4 +-
+ xmloff/source/text/XMLTextColumnsContext.cxx | 22 +-
+ xmloff/source/text/XMLTextColumnsExport.cxx | 26 +-
+ xmloff/source/text/XMLTextFrameContext.cxx | 34 +-
+ .../text/XMLTextFrameHyperlinkContext.cxx | 2 +-
+ xmloff/source/text/XMLTextListItemContext.cxx | 6 +-
+ .../source/text/XMLTextMarkImportContext.cxx | 12 +-
+ .../source/text/XMLTextMasterPageContext.cxx | 4 +-
+ .../source/text/XMLTextMasterPageExport.cxx | 28 +-
+ .../text/XMLTextMasterStylesContext.cxx | 2 +-
+ .../source/text/XMLTextShapeStyleContext.cxx | 6 +-
+ .../text/XMLTrackedChangesImportContext.cxx | 4 +-
+ xmloff/source/text/txtdrope.cxx | 10 +-
+ xmloff/source/text/txtdropi.cxx | 8 +-
+ xmloff/source/text/txtflde.cxx | 136 +--
+ xmloff/source/text/txtfldi.cxx | 40 +-
+ xmloff/source/text/txtftne.cxx | 48 +-
+ xmloff/source/text/txtimp.cxx | 558 ++++-----
+ xmloff/source/text/txtparae.cxx | 258 ++---
+ xmloff/source/text/txtparai.cxx | 36 +-
+ xmloff/source/text/txtprmap.cxx | 272 ++---
+ xmloff/source/text/txtstyle.cxx | 4 +-
+ xmloff/source/text/txtstyli.cxx | 6 +-
+ xmloff/source/text/txtvfldi.cxx | 8 +-
+ .../source/transform/ChartOASISTContext.cxx | 6 +-
+ xmloff/source/transform/ChartOOoTContext.cxx | 2 +-
+ .../transform/ChartPlotAreaOASISTContext.cxx | 10 +-
+ .../transform/ChartPlotAreaOOoTContext.cxx | 10 +-
+ .../source/transform/ControlOASISTContext.cxx | 2 +-
+ xmloff/source/transform/DocumentTContext.cxx | 4 +-
+ xmloff/source/transform/EventMap.cxx | 136 +--
+ .../source/transform/EventOASISTContext.cxx | 16 +-
+ xmloff/source/transform/EventOOoTContext.cxx | 2 +-
+ .../transform/FormPropOASISTContext.cxx | 8 +-
+ .../source/transform/FormPropOOoTContext.cxx | 8 +-
+ .../source/transform/FrameOASISTContext.cxx | 4 +-
+ xmloff/source/transform/FrameOOoTContext.cxx | 2 +-
+ xmloff/source/transform/MergeElemTContext.cxx | 2 +-
+ xmloff/source/transform/MetaTContext.cxx | 2 +-
+ xmloff/source/transform/NotesTContext.cxx | 8 +-
+ xmloff/source/transform/OOo2Oasis.cxx | 308 ++---
+ xmloff/source/transform/Oasis2OOo.cxx | 226 ++--
+ .../source/transform/PropertyActionsOASIS.cxx | 508 ++++-----
+ .../source/transform/PropertyActionsOOo.cxx | 1006 ++++++++---------
+ .../source/transform/StyleOASISTContext.cxx | 32 +-
+ xmloff/source/transform/StyleOOoTContext.cxx | 54 +-
+ .../source/transform/TransformerActions.hxx | 2 +-
+ xmloff/source/transform/TransformerBase.cxx | 24 +-
+ xmloff/source/xforms/TokenContext.cxx | 6 +-
+ xmloff/source/xforms/TokenContext.hxx | 2 +-
+ xmloff/source/xforms/XFormsBindContext.cxx | 4 +-
+ xmloff/source/xforms/xformsapi.cxx | 6 +-
+ xmloff/source/xforms/xformsexport.cxx | 32 +-
+ 300 files changed, 7026 insertions(+), 7018 deletions(-)
+
+diff --git a/dbaccess/source/filter/xml/xmlExport.cxx
b/dbaccess/source/filter/xml/xmlExport.cxx
+index 323e51bd3579..4697ce2d3543 100644
+--- a/dbaccess/source/filter/xml/xmlExport.cxx
++++ b/dbaccess/source/filter/xml/xmlExport.cxx
+@@ -150,31 +150,31 @@ ODBExport::ODBExport(const Reference< XComponentContext
>& _rxContext, OUString
+ GetMM100UnitConverter().SetCoreMeasureUnit(util::MeasureUnit::MM_10TH);
+ GetMM100UnitConverter().SetXMLMeasureUnit(util::MeasureUnit::CM);
+
+- GetNamespaceMap_().Add( GetXMLToken(XML_NP_OFFICE),
GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE );
+- GetNamespaceMap_().Add( GetXMLToken(XML_NP_OOO), GetXMLToken(XML_N_OOO),
XML_NAMESPACE_OOO );
+- GetNamespaceMap_().Add( GetXMLToken(XML_NP_SVG), GetXMLToken(XML_N_SVG),
XML_NAMESPACE_SVG );
++ GetNamespaceMap_().Add( GetXMLToken(XML_NP_OFFICE),
GetXMLToken(XML_N_OFFICE), XmlNamespace::OFFICE );
++ GetNamespaceMap_().Add( GetXMLToken(XML_NP_OOO), GetXMLToken(XML_N_OOO),
XmlNamespace::OOO );
++ GetNamespaceMap_().Add( GetXMLToken(XML_NP_SVG), GetXMLToken(XML_N_SVG),
XmlNamespace::SVG );
+
+- GetNamespaceMap_().Add( GetXMLToken(XML_NP_DB),
GetXMLToken(XML_N_DB_OASIS), XML_NAMESPACE_DB );
++ GetNamespaceMap_().Add( GetXMLToken(XML_NP_DB),
GetXMLToken(XML_N_DB_OASIS), XmlNamespace::DB );
+
+ if( nExportFlag &
(SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS)
)
+- GetNamespaceMap_().Add( GetXMLToken(XML_NP_FO),
GetXMLToken(XML_N_FO_COMPAT), XML_NAMESPACE_FO );
++ GetNamespaceMap_().Add( GetXMLToken(XML_NP_FO),
GetXMLToken(XML_N_FO_COMPAT), XmlNamespace::FO );
+
+ if( nExportFlag &
(SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::SETTINGS)
)
+ {
+- GetNamespaceMap_().Add( GetXMLToken(XML_NP_XLINK),
GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK );
++ GetNamespaceMap_().Add( GetXMLToken(XML_NP_XLINK),
GetXMLToken(XML_N_XLINK), XmlNamespace::XLINK );
+ }
+ if( nExportFlag & SvXMLExportFlags::SETTINGS )
+ {
+- GetNamespaceMap_().Add( GetXMLToken(XML_NP_CONFIG),
GetXMLToken(XML_N_CONFIG), XML_NAMESPACE_CONFIG );
++ GetNamespaceMap_().Add( GetXMLToken(XML_NP_CONFIG),
GetXMLToken(XML_N_CONFIG), XmlNamespace::CONFIG );
+ }
+
+ if( nExportFlag &
(SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::FONTDECLS)
)
+ {
+- GetNamespaceMap_().Add( GetXMLToken(XML_NP_STYLE),
GetXMLToken(XML_N_STYLE), XML_NAMESPACE_STYLE );
++ GetNamespaceMap_().Add( GetXMLToken(XML_NP_STYLE),
GetXMLToken(XML_N_STYLE), XmlNamespace::STYLE );
+ }
+
+- GetNamespaceMap_().Add( GetXMLToken(XML_NP_TABLE),
GetXMLToken(XML_N_TABLE), XML_NAMESPACE_TABLE );
+- GetNamespaceMap_().Add( GetXMLToken(XML_NP_NUMBER),
GetXMLToken(XML_N_NUMBER), XML_NAMESPACE_NUMBER );
++ GetNamespaceMap_().Add( GetXMLToken(XML_NP_TABLE),
GetXMLToken(XML_N_TABLE), XmlNamespace::TABLE );
++ GetNamespaceMap_().Add( GetXMLToken(XML_NP_NUMBER),
GetXMLToken(XML_N_NUMBER), XmlNamespace::NUMBER );
+
+ m_xExportHelper = new
SvXMLExportPropertyMapper(GetTableStylesPropertySetMapper());
+ m_xColumnExportHelper = new
OSpecialHandleXMLExportPropertyMapper(GetColumnStylesPropertySetMapper());
+@@ -422,7 +422,7 @@ void ODBExport::exportDataSource()
+ if ( aDelimiter.bUsed )
+ m_aDelimiter.reset( new TDelimiter( aDelimiter ) );
+
+- SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_DATASOURCE,
true, true);
++ SvXMLElementExport aElem(*this,XmlNamespace::DB, XML_DATASOURCE,
true, true);
+
+ exportConnectionData();
+ exportDriverSettings(aSettingsMap);
+@@ -450,16 +450,16 @@ void
ODBExport::exportApplicationConnectionSettings(const TSettingsMap& _aSettin
+ {
+ TSettingsMap::const_iterator aFind = _aSettings.find(i);
+ if ( aFind != _aSettings.end() )
+- AddAttribute(XML_NAMESPACE_DB, aFind->first,aFind->second);
++ AddAttribute(XmlNamespace::DB, aFind->first,aFind->second);
+ }
+- SvXMLElementExport aElem(*this,XML_NAMESPACE_DB,
XML_APPLICATION_CONNECTION_SETTINGS, true, true);
++ SvXMLElementExport aElem(*this,XmlNamespace::DB,
XML_APPLICATION_CONNECTION_SETTINGS, true, true);
+
+ Reference<XPropertySet> xProp(getDataSource());
+ Sequence< OUString> aValue;
+ xProp->getPropertyValue(PROPERTY_TABLEFILTER) >>= aValue;
+ if ( aValue.hasElements() )
+ {
+- SvXMLElementExport aElem2(*this,XML_NAMESPACE_DB, XML_TABLE_FILTER,
true, true);
++ SvXMLElementExport aElem2(*this,XmlNamespace::DB, XML_TABLE_FILTER,
true, true);
+
exportSequence(aValue,XML_TABLE_INCLUDE_FILTER,XML_TABLE_FILTER_PATTERN);
+ }
+
+@@ -483,9 +483,9 @@ void ODBExport::exportDriverSettings(const TSettingsMap&
_aSettings)
+ {
+ TSettingsMap::const_iterator aFind = _aSettings.find(nSetting);
+ if ( aFind != _aSettings.end() )
+- AddAttribute(XML_NAMESPACE_DB, aFind->first,aFind->second);
++ AddAttribute(XmlNamespace::DB, aFind->first,aFind->second);
+ }
+- SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_DRIVER_SETTINGS,
true, true);
++ SvXMLElementExport aElem(*this,XmlNamespace::DB, XML_DRIVER_SETTINGS,
true, true);
+ exportAutoIncrement();
+ exportDelimiter();
+ exportCharSet();
+@@ -493,7 +493,7 @@ void ODBExport::exportDriverSettings(const TSettingsMap&
_aSettings)
+
+ void ODBExport::exportConnectionData()
+ {
+- SvXMLElementExport aConnData(*this,XML_NAMESPACE_DB, XML_CONNECTION_DATA,
true, true);
++ SvXMLElementExport aConnData(*this,XmlNamespace::DB, XML_CONNECTION_DATA,
true, true);
+
+ {
+ OUString sValue;
+@@ -501,7 +501,7 @@ void ODBExport::exportConnectionData()
+ xProp->getPropertyValue(PROPERTY_URL) >>= sValue;
+ if ( m_aTypeCollection.isFileSystemBased(sValue) )
+ {
+- SvXMLElementExport aDatabaseDescription(*this,XML_NAMESPACE_DB,
XML_DATABASE_DESCRIPTION, true, true);
++ SvXMLElementExport aDatabaseDescription(*this,XmlNamespace::DB,
XML_DATABASE_DESCRIPTION, true, true);
+ {
+ SvtPathOptions aPathOptions;
+ const OUString sOrigUrl = m_aTypeCollection.cutPrefix(sValue);
+@@ -513,11 +513,11 @@ void ODBExport::exportConnectionData()
+ if (sURL.isEmpty() || sURL[sURL.getLength() - 1] != '/')
+ sURL.append('/');
+
+-
AddAttribute(XML_NAMESPACE_XLINK,XML_HREF,GetRelativeReference(sURL.makeStringAndClear()));
++
AddAttribute(XmlNamespace::XLINK,XML_HREF,GetRelativeReference(sURL.makeStringAndClear()));
+ }
+ else
+- AddAttribute(XML_NAMESPACE_XLINK,XML_HREF,sOrigUrl);
+-
AddAttribute(XML_NAMESPACE_DB,XML_MEDIA_TYPE,m_aTypeCollection.getMediaType(sValue));
++ AddAttribute(XmlNamespace::XLINK,XML_HREF,sOrigUrl);
++
AddAttribute(XmlNamespace::DB,XML_MEDIA_TYPE,m_aTypeCollection.getMediaType(sValue));
+ const ::dbaccess::DATASOURCE_TYPE eType =
m_aTypeCollection.determineType(sValue);
+ try
+ {
+@@ -531,12 +531,12 @@ void ODBExport::exportConnectionData()
+ xDataSourceSettings->getPropertyValue(
INFO_TEXTFILEEXTENSION ) >>= sExtension;
+ }
+ if ( !sExtension.isEmpty() )
+-
AddAttribute(XML_NAMESPACE_DB,XML_EXTENSION,sExtension);
++
AddAttribute(XmlNamespace::DB,XML_EXTENSION,sExtension);
+ }
+ catch(const Exception&)
+ {
+ }
+- SvXMLElementExport aFileBasedDB(*this,XML_NAMESPACE_DB,
XML_FILE_BASED_DATABASE, true, true);
++ SvXMLElementExport aFileBasedDB(*this,XmlNamespace::DB,
XML_FILE_BASED_DATABASE, true, true);
+ }
+ }
+ else
+@@ -546,15 +546,15 @@ void ODBExport::exportConnectionData()
+
m_aTypeCollection.extractHostNamePort(sValue,sDatabaseName,sHostName,nPort);
+ if ( sHostName.getLength() )
+ {
+- SvXMLElementExport
aDatabaseDescription(*this,XML_NAMESPACE_DB, XML_DATABASE_DESCRIPTION, true,
true);
++ SvXMLElementExport
aDatabaseDescription(*this,XmlNamespace::DB, XML_DATABASE_DESCRIPTION, true,
true);
+ {
+ OUString sType =
comphelper::string::stripEnd(m_aTypeCollection.getPrefix(sValue), ':');
+- AddAttribute(XML_NAMESPACE_DB,XML_TYPE,sType);
+- AddAttribute(XML_NAMESPACE_DB,XML_HOSTNAME,sHostName);
++ AddAttribute(XmlNamespace::DB,XML_TYPE,sType);
++ AddAttribute(XmlNamespace::DB,XML_HOSTNAME,sHostName);
+ if ( nPort != -1 )
+-
AddAttribute(XML_NAMESPACE_DB,XML_PORT,OUString::number(nPort));
++
AddAttribute(XmlNamespace::DB,XML_PORT,OUString::number(nPort));
+ if ( sDatabaseName.getLength() )
+-
AddAttribute(XML_NAMESPACE_DB,XML_DATABASE_NAME,sDatabaseName);
++
AddAttribute(XmlNamespace::DB,XML_DATABASE_NAME,sDatabaseName);
+
+ try
+ {
+@@ -567,7 +567,7 @@ void ODBExport::exportConnectionData()
+ {
+ OUString sPropertyValue;
+ if ( ( xDataSourceSettings->getPropertyValue(
sPropertyName ) >>= sPropertyValue ) && !sPropertyValue.isEmpty() )
+- AddAttribute( XML_NAMESPACE_DB,
XML_LOCAL_SOCKET, sPropertyValue );
++ AddAttribute( XmlNamespace::DB,
XML_LOCAL_SOCKET, sPropertyValue );
+ }
+ }
+ catch( const Exception& )
+@@ -575,14 +575,14 @@ void ODBExport::exportConnectionData()
+ DBG_UNHANDLED_EXCEPTION("dbaccess");
+ }
+
+- SvXMLElementExport aServerDB(*this,XML_NAMESPACE_DB,
XML_SERVER_DATABASE, true, true);
++ SvXMLElementExport aServerDB(*this,XmlNamespace::DB,
XML_SERVER_DATABASE, true, true);
+ }
+ }
+ else
+ {
+- AddAttribute(XML_NAMESPACE_XLINK, XML_HREF,sValue);
+- AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE);
+- SvXMLElementExport aElem(*this,XML_NAMESPACE_DB,
XML_CONNECTION_RESOURCE, true, true);
++ AddAttribute(XmlNamespace::XLINK, XML_HREF,sValue);
++ AddAttribute(XmlNamespace::XLINK, XML_TYPE, XML_SIMPLE);
++ SvXMLElementExport aElem(*this,XmlNamespace::DB,
XML_CONNECTION_RESOURCE, true, true);
+ }
+ }
+
+@@ -599,7 +599,7 @@ template< typename T > void
ODBExport::exportDataSourceSettingsSequence(
+ assert(bSuccess); (void)bSuccess;
+ for (T const & i : anySeq )
+ {
+- SvXMLElementExport aDataValue(*this,XML_NAMESPACE_DB,
XML_DATA_SOURCE_SETTING_VALUE, true, false);
++ SvXMLElementExport aDataValue(*this,XmlNamespace::DB,
XML_DATA_SOURCE_SETTING_VALUE, true, false);
+ // (no whitespace inside the tag)
+ Characters(implConvertAny(css::uno::Any(i)));
+ }
+@@ -610,7 +610,7 @@ void ODBExport::exportDataSourceSettings()
+ if ( m_aDataSourceSettings.empty() )
+ return;
+
+- SvXMLElementExport aElem(*this,XML_NAMESPACE_DB,
XML_DATA_SOURCE_SETTINGS, true, true);
++ SvXMLElementExport aElem(*this,XmlNamespace::DB,
XML_DATA_SOURCE_SETTINGS, true, true);
+ std::vector< TypedPropertyValue >::iterator aIter =
m_aDataSourceSettings.begin();
+ std::vector< TypedPropertyValue >::const_iterator aEnd =
m_aDataSourceSettings.end();
+ for ( ; aIter != aEnd; ++aIter )
+@@ -619,8 +619,8 @@ void ODBExport::exportDataSourceSettings()
+
+ Type aSimpleType(bIsSequence ?
comphelper::getSequenceElementType(aIter->Value.getValueType()) : aIter->Type);
+
+- AddAttribute( XML_NAMESPACE_DB,
XML_DATA_SOURCE_SETTING_IS_LIST,bIsSequence ? XML_TRUE : XML_FALSE );
+- AddAttribute( XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_NAME,
aIter->Name );
++ AddAttribute( XmlNamespace::DB,
XML_DATA_SOURCE_SETTING_IS_LIST,bIsSequence ? XML_TRUE : XML_FALSE );
++ AddAttribute( XmlNamespace::DB, XML_DATA_SOURCE_SETTING_NAME,
aIter->Name );
+
+ OUString sTypeName = lcl_implGetPropertyXMLType( aSimpleType );
+ if ( bIsSequence && aSimpleType.getTypeClass() == TypeClass_ANY )
+@@ -631,13 +631,13 @@ void ODBExport::exportDataSourceSettings()
+ sTypeName =
lcl_implGetPropertyXMLType(aSeq[0].getValueType());
+ }
+
+- AddAttribute( XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_TYPE,
sTypeName );
++ AddAttribute( XmlNamespace::DB, XML_DATA_SOURCE_SETTING_TYPE,
sTypeName );
+
+- SvXMLElementExport aDataSourceSetting( *this, XML_NAMESPACE_DB,
XML_DATA_SOURCE_SETTING, true, true );
++ SvXMLElementExport aDataSourceSetting( *this, XmlNamespace::DB,
XML_DATA_SOURCE_SETTING, true, true );
+
+ if ( !bIsSequence )
+ {
+- SvXMLElementExport aDataValue( *this, XML_NAMESPACE_DB,
XML_DATA_SOURCE_SETTING_VALUE, true, false );
++ SvXMLElementExport aDataValue( *this, XmlNamespace::DB,
XML_DATA_SOURCE_SETTING_VALUE, true, false );
+ // (no whitespace inside the tag)
+ Characters( implConvertAny( aIter->Value ) );
+ }
+@@ -680,9 +680,9 @@ void ODBExport::exportCharSet()
+ {
+ if ( !m_sCharSet.isEmpty() )
+ {
+- AddAttribute(XML_NAMESPACE_DB, XML_ENCODING,m_sCharSet);
++ AddAttribute(XmlNamespace::DB, XML_ENCODING,m_sCharSet);
+
+- SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_FONT_CHARSET,
true, true);
++ SvXMLElementExport aElem(*this,XmlNamespace::DB, XML_FONT_CHARSET,
true, true);
+ }
+ }
+
+@@ -690,11 +690,11 @@ void ODBExport::exportDelimiter()
+ {
+ if ( m_aDelimiter && m_aDelimiter->bUsed )
+ {
+- AddAttribute(XML_NAMESPACE_DB, XML_FIELD,m_aDelimiter->sField);
+- AddAttribute(XML_NAMESPACE_DB, XML_STRING,m_aDelimiter->sText);
+- AddAttribute(XML_NAMESPACE_DB, XML_DECIMAL,m_aDelimiter->sDecimal);
+- AddAttribute(XML_NAMESPACE_DB, XML_THOUSAND,m_aDelimiter->sThousand);
+- SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_DELIMITER, true,
true);
++ AddAttribute(XmlNamespace::DB, XML_FIELD,m_aDelimiter->sField);
++ AddAttribute(XmlNamespace::DB, XML_STRING,m_aDelimiter->sText);
++ AddAttribute(XmlNamespace::DB, XML_DECIMAL,m_aDelimiter->sDecimal);
++ AddAttribute(XmlNamespace::DB, XML_THOUSAND,m_aDelimiter->sThousand);
++ SvXMLElementExport aElem(*this,XmlNamespace::DB, XML_DELIMITER, true,
true);
+ }
+ }
+
+@@ -702,9 +702,9 @@ void ODBExport::exportAutoIncrement()
+ {
+ if (m_aAutoIncrement)
+ {
+- AddAttribute(XML_NAMESPACE_DB,
XML_ADDITIONAL_COLUMN_STATEMENT,m_aAutoIncrement->second);
+- AddAttribute(XML_NAMESPACE_DB,
XML_ROW_RETRIEVING_STATEMENT,m_aAutoIncrement->first);
+- SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_AUTO_INCREMENT,
true, true);
++ AddAttribute(XmlNamespace::DB,
XML_ADDITIONAL_COLUMN_STATEMENT,m_aAutoIncrement->second);
++ AddAttribute(XmlNamespace::DB,
XML_ROW_RETRIEVING_STATEMENT,m_aAutoIncrement->first);
++ SvXMLElementExport aElem(*this,XmlNamespace::DB, XML_AUTO_INCREMENT,
true, true);
+ }
+ }
+
+@@ -714,13 +714,13 @@ void ODBExport::exportSequence(const Sequence<
OUString>& _aValue
+ {
+ if ( _aValue.hasElements() )
+ {
+- SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, _eTokenFilter, true,
true);
++ SvXMLElementExport aElem(*this,XmlNamespace::DB, _eTokenFilter, true,
true);
+
+ const OUString* pIter = _aValue.getConstArray();
+ const OUString* pEnd = pIter + _aValue.getLength();
+ for(;pIter != pEnd;++pIter)
+ {
+- SvXMLElementExport aDataSource(*this,XML_NAMESPACE_DB,
_eTokenType, true, false);
++ SvXMLElementExport aDataSource(*this,XmlNamespace::DB,
_eTokenType, true, false);
+ Characters(*pIter);
+ }
+ }
+@@ -733,15 +733,15 @@ void ODBExport::exportLogin()
+ xProp->getPropertyValue(PROPERTY_USER) >>= sValue;
+ bool bAddLogin = !sValue.isEmpty();
+ if ( bAddLogin )
+- AddAttribute(XML_NAMESPACE_DB, XML_USER_NAME,sValue);
++ AddAttribute(XmlNamespace::DB, XML_USER_NAME,sValue);
+ bool bValue = false;
+ if ( xProp->getPropertyValue(PROPERTY_ISPASSWORDREQUIRED) >>= bValue )
+ {
+ bAddLogin = true;
+- AddAttribute(XML_NAMESPACE_DB, XML_IS_PASSWORD_REQUIRED,bValue ?
XML_TRUE : XML_FALSE);
++ AddAttribute(XmlNamespace::DB, XML_IS_PASSWORD_REQUIRED,bValue ?
XML_TRUE : XML_FALSE);
+ }
+ if ( bAddLogin )
+- SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_LOGIN, true,
true);
++ SvXMLElementExport aElem(*this,XmlNamespace::DB, XML_LOGIN, true,
true);
+ }
+
+ void ODBExport::exportCollection(const Reference< XNameAccess >& _xCollection
+@@ -756,7 +756,7 @@ void ODBExport::exportCollection(const Reference<
XNameAccess >& _xCollection
+
+ std::unique_ptr<SvXMLElementExport> pComponents;
+ if ( _bExportContext )
+- pComponents.reset( new SvXMLElementExport(*this,XML_NAMESPACE_DB,
_eComponents, true, true));
++ pComponents.reset( new SvXMLElementExport(*this,XmlNamespace::DB,
_eComponents, true, true));
+ Sequence< OUString> aSeq = _xCollection->getElementNames();
+ const OUString* pIter = aSeq.getConstArray();
+ const OUString* pEnd = pIter + aSeq.getLength();
+@@ -764,7 +764,7 @@ void ODBExport::exportCollection(const Reference<
XNameAccess >& _xCollection
+ {
+ Reference<XPropertySet>
xProp(_xCollection->getByName(*pIter),UNO_QUERY);
+ if ( _bExportContext && XML_TABLE_REPRESENTATIONS != _eComponents )
+- AddAttribute(XML_NAMESPACE_DB, XML_NAME,*pIter);
++ AddAttribute(XmlNamespace::DB, XML_NAME,*pIter);
+ Reference< XNameAccess > xSub(xProp,UNO_QUERY);
+ if ( xSub.is() )
+ {
+@@ -786,31 +786,31 @@ void ODBExport::exportComponent(XPropertySet* _xProp)
+ else
+ sValue = "reports/" + sValue;
+
+- AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, sValue);
+- AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE);
++ AddAttribute(XmlNamespace::XLINK, XML_HREF, sValue);
++ AddAttribute(XmlNamespace::XLINK, XML_TYPE, XML_SIMPLE);
+ bool bAsTemplate = false;
+ _xProp->getPropertyValue(PROPERTY_AS_TEMPLATE) >>= bAsTemplate;
+- AddAttribute(XML_NAMESPACE_DB, XML_AS_TEMPLATE,bAsTemplate ? XML_TRUE :
XML_FALSE);
+- SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB, XML_COMPONENT,
true, true);
++ AddAttribute(XmlNamespace::DB, XML_AS_TEMPLATE,bAsTemplate ? XML_TRUE :
XML_FALSE);
++ SvXMLElementExport aComponents(*this,XmlNamespace::DB, XML_COMPONENT,
true, true);
+ }
+
+ void ODBExport::exportQuery(XPropertySet* _xProp)
+ {
+- AddAttribute(XML_NAMESPACE_DB,
XML_COMMAND,getString(_xProp->getPropertyValue(PROPERTY_COMMAND)));
++ AddAttribute(XmlNamespace::DB,
XML_COMMAND,getString(_xProp->getPropertyValue(PROPERTY_COMMAND)));
+
+ if ( getBOOL(_xProp->getPropertyValue(PROPERTY_APPLYFILTER)) )
+- AddAttribute(XML_NAMESPACE_DB, XML_APPLY_FILTER,XML_TRUE);
++ AddAttribute(XmlNamespace::DB, XML_APPLY_FILTER,XML_TRUE);
+
+ if ( _xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_APPLYORDER)
+ && getBOOL(_xProp->getPropertyValue(PROPERTY_APPLYORDER)) )
+- AddAttribute(XML_NAMESPACE_DB, XML_APPLY_ORDER,XML_TRUE);
++ AddAttribute(XmlNamespace::DB, XML_APPLY_ORDER,XML_TRUE);
+
+ if ( ! getBOOL(_xProp->getPropertyValue(PROPERTY_ESCAPE_PROCESSING)) )
+- AddAttribute(XML_NAMESPACE_DB, XML_ESCAPE_PROCESSING,XML_FALSE);
++ AddAttribute(XmlNamespace::DB, XML_ESCAPE_PROCESSING,XML_FALSE);
+
+ exportStyleName(_xProp,GetAttrList());
+
+- SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB, XML_QUERY, true,
true);
++ SvXMLElementExport aComponents(*this,XmlNamespace::DB, XML_QUERY, true,
true);
+ Reference<XColumnsSupplier> xCol(_xProp,UNO_QUERY);
+ exportColumns(xCol);
+ exportFilter(_xProp,PROPERTY_FILTER,XML_FILTER_STATEMENT);
+@@ -823,18 +823,18 @@ void ODBExport::exportTable(XPropertySet* _xProp)
+ exportTableName(_xProp,false);
+
+ if (
_xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_DESCRIPTION) )
+- AddAttribute(XML_NAMESPACE_DB,
XML_DESCRIPTION,getString(_xProp->getPropertyValue(PROPERTY_DESCRIPTION)));
++ AddAttribute(XmlNamespace::DB,
XML_DESCRIPTION,getString(_xProp->getPropertyValue(PROPERTY_DESCRIPTION)));
+
+ if ( getBOOL(_xProp->getPropertyValue(PROPERTY_APPLYFILTER)) )
+- AddAttribute(XML_NAMESPACE_DB, XML_APPLY_FILTER,XML_TRUE);
++ AddAttribute(XmlNamespace::DB, XML_APPLY_FILTER,XML_TRUE);
+
+ if ( _xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_APPLYORDER)
+ && getBOOL(_xProp->getPropertyValue(PROPERTY_APPLYORDER)) )
+- AddAttribute(XML_NAMESPACE_DB, XML_APPLY_ORDER,XML_TRUE);
++ AddAttribute(XmlNamespace::DB, XML_APPLY_ORDER,XML_TRUE);
+
+ exportStyleName(_xProp,GetAttrList());
+
+- SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB,
XML_TABLE_REPRESENTATION, true, true);
++ SvXMLElementExport aComponents(*this,XmlNamespace::DB,
XML_TABLE_REPRESENTATION, true, true);
+ Reference<XColumnsSupplier> xCol(_xProp,UNO_QUERY);
+ exportColumns(xCol);
+ exportFilter(_xProp,PROPERTY_FILTER,XML_FILTER_STATEMENT);
+@@ -854,7 +854,7 @@ void ODBExport::exportStyleName(const
::xmloff::token::XMLTokenEnum _eToken,cons
+ TPropertyStyleMap::const_iterator aFind = _rMap.find(_xProp);
+ if ( aFind != _rMap.end() )
+ {
+- _rAtt.AddAttribute( GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_DB, GetXMLToken(_eToken) ),
++ _rAtt.AddAttribute( GetNamespaceMap().GetQNameByKey(
XmlNamespace::DB, GetXMLToken(_eToken) ),
+ aFind->second );
+ _rMap.erase(aFind);
+ }
+@@ -867,17 +867,17 @@ void ODBExport::exportTableName(XPropertySet*
_xProp,bool _bUpdate)
+ if ( sValue.isEmpty() )
+ return;
+
+- AddAttribute(XML_NAMESPACE_DB, XML_NAME,sValue);
++ AddAttribute(XmlNamespace::DB, XML_NAME,sValue);
+ _xProp->getPropertyValue(_bUpdate ? OUString(PROPERTY_UPDATE_SCHEMANAME)
: OUString(PROPERTY_SCHEMANAME)) >>= sValue;
+ if ( !sValue.isEmpty() )
+- AddAttribute(XML_NAMESPACE_DB, XML_SCHEMA_NAME,sValue);
++ AddAttribute(XmlNamespace::DB, XML_SCHEMA_NAME,sValue);
+ _xProp->getPropertyValue(_bUpdate ? OUString(PROPERTY_UPDATE_CATALOGNAME)
: OUString(PROPERTY_CATALOGNAME)) >>= sValue;
+ if ( !sValue.isEmpty() )
+- AddAttribute(XML_NAMESPACE_DB, XML_CATALOG_NAME,sValue);
++ AddAttribute(XmlNamespace::DB, XML_CATALOG_NAME,sValue);
+
+ if ( _bUpdate )
+ {
+- SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB,
XML_UPDATE_TABLE, true, true);
++ SvXMLElementExport aComponents(*this,XmlNamespace::DB,
XML_UPDATE_TABLE, true, true);
+ }
+ }
+
+@@ -890,8 +890,8 @@ void ODBExport::exportFilter(XPropertySet* _xProp
+ _xProp->getPropertyValue(_sProp) >>= sCommand;
+ if ( !sCommand.isEmpty() )
+ {
+- AddAttribute(XML_NAMESPACE_DB, XML_COMMAND,sCommand);
+- SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB,
_eStatementType, true, true);
++ AddAttribute(XmlNamespace::DB, XML_COMMAND,sCommand);
++ SvXMLElementExport aComponents(*this,XmlNamespace::DB,
_eStatementType, true, true);
+ }
+ SAL_WARN_IF(GetAttrList().getLength(), "dbaccess", "Invalid attribute
length!");
+ }
+@@ -911,18 +911,18 @@ void ODBExport::exportColumns(const
Reference<XColumnsSupplier>& _xColSup)
+ TTableColumnMap::const_iterator aFind =
m_aTableDummyColumns.find(xComponent);
+ if ( aFind != m_aTableDummyColumns.end() )
+ {
+- SvXMLElementExport aColumns(*this,XML_NAMESPACE_DB,
XML_COLUMNS, true, true);
++ SvXMLElementExport aColumns(*this,XmlNamespace::DB,
XML_COLUMNS, true, true);
+ SvXMLAttributeList* pAtt = new SvXMLAttributeList;
+ Reference<XAttributeList> xAtt = pAtt;
+ exportStyleName(aFind->second.get(),*pAtt);
+ AddAttributeList(xAtt);
+- SvXMLElementExport aColumn(*this,XML_NAMESPACE_DB,
XML_COLUMN, true, true);
++ SvXMLElementExport aColumn(*this,XmlNamespace::DB,
XML_COLUMN, true, true);
+
+ }
+ return;
+ }
+
+- SvXMLElementExport aColumns(*this,XML_NAMESPACE_DB, XML_COLUMNS,
true, true);
++ SvXMLElementExport aColumns(*this,XmlNamespace::DB, XML_COLUMNS,
true, true);
+ Sequence< OUString> aSeq = xNameAccess->getElementNames();
+ const OUString* pIter = aSeq.getConstArray();
+ const OUString* pEnd = pIter + aSeq.getLength();
+@@ -943,20 +943,20 @@ void ODBExport::exportColumns(const
Reference<XColumnsSupplier>& _xColSup)
+
+ if ( bHidden || !sValue.isEmpty() ||
aColumnDefault.hasValue() || pAtt->getLength() )
+ {
+- AddAttribute(XML_NAMESPACE_DB, XML_NAME,*pIter);
++ AddAttribute(XmlNamespace::DB, XML_NAME,*pIter);
+ if ( bHidden )
+- AddAttribute(XML_NAMESPACE_DB, XML_VISIBLE,XML_FALSE);
++ AddAttribute(XmlNamespace::DB, XML_VISIBLE,XML_FALSE);
+
+ if ( !sValue.isEmpty() )
+- AddAttribute(XML_NAMESPACE_DB,
XML_HELP_MESSAGE,sValue);
++ AddAttribute(XmlNamespace::DB,
XML_HELP_MESSAGE,sValue);
+
+ if ( aColumnDefault.hasValue() )
+ {
+ OUStringBuffer sColumnDefaultString,sType;
+ ::sax::Converter::convertAny(
+ sColumnDefaultString, sType, aColumnDefault );
+- AddAttribute(XML_NAMESPACE_DB,
XML_TYPE_NAME,sType.makeStringAndClear());
+- AddAttribute(XML_NAMESPACE_DB,
XML_DEFAULT_VALUE,sColumnDefaultString.makeStringAndClear());
++ AddAttribute(XmlNamespace::DB,
XML_TYPE_NAME,sType.makeStringAndClear());
++ AddAttribute(XmlNamespace::DB,
XML_DEFAULT_VALUE,sColumnDefaultString.makeStringAndClear());
+ }
+
+ if ( pAtt->getLength() )
+@@ -965,7 +965,7 @@ void ODBExport::exportColumns(const
Reference<XColumnsSupplier>& _xColSup)
+
+ if ( GetAttrList().getLength() )
+ {
+- SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB,
XML_COLUMN, true, true);
++ SvXMLElementExport aComponents(*this,XmlNamespace::DB,
XML_COLUMN, true, true);
+ }
+ }
+ }
+diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx
b/dbaccess/source/filter/xml/xmlHelper.cxx
+index a9f156fc5a51..f82a16db0a25 100644
+--- a/dbaccess/source/filter/xml/xmlHelper.cxx
++++ b/dbaccess/source/filter/xml/xmlHelper.cxx
+@@ -84,9 +84,9 @@ rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetColumnStylesPropertySetMa
+ #define MAP_CONST_COLUMN( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE_COLUMN, context,
SvtSaveOptions::ODFSVER_010, false }
+ static const XMLPropertyMapEntry s_aColumnStylesProperties[] =
+ {
+- MAP_CONST_COLUMN( PROPERTY_WIDTH, XML_NAMESPACE_STYLE,
XML_COLUMN_WIDTH, XML_TYPE_MEASURE, 0),
+- MAP_CONST_COLUMN( PROPERTY_HIDDEN, XML_NAMESPACE_TABLE,
XML_DISPLAY, XML_DB_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM,
CTF_DB_ISVISIBLE ),
+- MAP_CONST_COLUMN( PROPERTY_NUMBERFORMAT, XML_NAMESPACE_STYLE,
XML_DATA_STYLE_NAME, XML_TYPE_NUMBER|MID_FLAG_SPECIAL_ITEM,
CTF_DB_NUMBERFORMAT),
++ MAP_CONST_COLUMN( PROPERTY_WIDTH, XmlNamespace::STYLE,
XML_COLUMN_WIDTH, XML_TYPE_MEASURE, 0),
++ MAP_CONST_COLUMN( PROPERTY_HIDDEN, XmlNamespace::TABLE,
XML_DISPLAY, XML_DB_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM,
CTF_DB_ISVISIBLE ),
++ MAP_CONST_COLUMN( PROPERTY_NUMBERFORMAT, XmlNamespace::STYLE,
XML_DATA_STYLE_NAME, XML_TYPE_NUMBER|MID_FLAG_SPECIAL_ITEM,
CTF_DB_NUMBERFORMAT),
+ MAP_END()
+ };
+ rtl::Reference < XMLPropertyHandlerFactory> xFac = new
OPropertyHandlerFactory();
+@@ -99,35 +99,35 @@ rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetCellStylesPropertySetMapp
+ #define MAP_CONST_TEXT( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context,
SvtSaveOptions::ODFSVER_010, false }
+ static const XMLPropertyMapEntry s_aCellStylesProperties[] =
+ {
+- MAP_CONST_CELL( PROPERTY_ALIGN, XML_NAMESPACE_FO,
XML_TEXT_ALIGN, XML_TYPE_TEXT_ALIGN, CTF_DB_COLUMN_TEXT_ALIGN),
+- MAP_CONST_TEXT( PROPERTY_FONTNAME, XML_NAMESPACE_STYLE,
XML_FONT_NAME, XML_TYPE_STRING, 0 ),
+- MAP_CONST_TEXT( PROPERTY_TEXTCOLOR, XML_NAMESPACE_FO,
XML_COLOR, XML_TYPE_COLOR, 0 ),
+- MAP_CONST_TEXT( PROPERTY_TEXTLINECOLOR, XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_COLOR,
XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
+-
+- MAP_CONST_TEXT( PROPERTY_TEXTRELIEF, XML_NAMESPACE_STYLE,
XML_FONT_RELIEF,
XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ),
+- MAP_CONST_TEXT( PROPERTY_TEXTEMPHASIS, XML_NAMESPACE_STYLE,
XML_TEXT_EMPHASIZE, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ),
+- MAP_CONST_TEXT( PROPERTY_FONTCHARWIDTH, XML_NAMESPACE_STYLE,
XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16, 0 ),
+- MAP_CONST_TEXT( PROPERTY_FONTCHARSET, XML_NAMESPACE_STYLE,
XML_FONT_CHARSET, XML_TYPE_TEXT_FONTENCODING, 0 ),
+- MAP_CONST_TEXT( PROPERTY_FONTFAMILY, XML_NAMESPACE_STYLE,
XML_FONT_FAMILY_GENERIC, XML_TYPE_TEXT_FONTFAMILY, 0 ),
+- MAP_CONST_TEXT( PROPERTY_FONTHEIGHT, XML_NAMESPACE_FO,
XML_FONT_SIZE, XML_TYPE_MEASURE16, 0 ),
+- MAP_CONST_TEXT( PROPERTY_FONTKERNING, XML_NAMESPACE_STYLE,
XML_LETTER_KERNING, XML_TYPE_BOOL, 0 ),
+-
+- MAP_CONST_TEXT( PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE,
XML_ROTATION_ANGLE, XML_TYPE_ROTATION_ANGLE, 0 ),
+- MAP_CONST_TEXT( PROPERTY_FONTPITCH, XML_NAMESPACE_STYLE,
XML_FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, 0 ),
+- MAP_CONST_TEXT( PROPERTY_FONTSLANT, XML_NAMESPACE_FO,
XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ),
+- MAP_CONST_TEXT( "CharStrikeout", XML_NAMESPACE_STYLE,
XML_TEXT_LINE_THROUGH_STYLE,
XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0),
+- MAP_CONST_TEXT( "CharStrikeout", XML_NAMESPACE_STYLE,
XML_TEXT_LINE_THROUGH_TYPE,
XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY, 0),
+- MAP_CONST_TEXT( "CharStrikeout", XML_NAMESPACE_STYLE,
XML_TEXT_LINE_THROUGH_WIDTH,
XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0),
+- MAP_CONST_TEXT( "CharStrikeout", XML_NAMESPACE_STYLE,
XML_TEXT_LINE_THROUGH_TEXT,
XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY, 0),
+- MAP_CONST_TEXT( PROPERTY_FONTSTYLENAME, XML_NAMESPACE_STYLE,
XML_FONT_STYLE_NAME, XML_TYPE_STRING, 0 ),
+- MAP_CONST_TEXT( "CharUnderline", XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_STYLE,
XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ),
+- MAP_CONST_TEXT( "CharUnderline", XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_TYPE,
XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ),
+- MAP_CONST_TEXT( "CharUnderline", XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_WIDTH,
XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ),
+- MAP_CONST_TEXT( "CharUnderlineColor", XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_COLOR,
XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
+- MAP_CONST_TEXT( "CharUnderlineHasColor", XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_COLOR,
XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
+- MAP_CONST_TEXT( PROPERTY_FONTWEIGHT, XML_NAMESPACE_FO,
XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ),
+- MAP_CONST_TEXT( PROPERTY_FONTWIDTH, XML_NAMESPACE_STYLE,
XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH, 0 ),
+- MAP_CONST_TEXT( PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_MODE,
XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
++ MAP_CONST_CELL( PROPERTY_ALIGN, XmlNamespace::FO,
XML_TEXT_ALIGN, XML_TYPE_TEXT_ALIGN, CTF_DB_COLUMN_TEXT_ALIGN),
++ MAP_CONST_TEXT( PROPERTY_FONTNAME, XmlNamespace::STYLE,
XML_FONT_NAME, XML_TYPE_STRING, 0 ),
++ MAP_CONST_TEXT( PROPERTY_TEXTCOLOR, XmlNamespace::FO,
XML_COLOR, XML_TYPE_COLOR, 0 ),
++ MAP_CONST_TEXT( PROPERTY_TEXTLINECOLOR, XmlNamespace::STYLE,
XML_TEXT_UNDERLINE_COLOR,
XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
++
++ MAP_CONST_TEXT( PROPERTY_TEXTRELIEF, XmlNamespace::STYLE,
XML_FONT_RELIEF,
XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ),
++ MAP_CONST_TEXT( PROPERTY_TEXTEMPHASIS, XmlNamespace::STYLE,
XML_TEXT_EMPHASIZE, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ),
++ MAP_CONST_TEXT( PROPERTY_FONTCHARWIDTH, XmlNamespace::STYLE,
XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16, 0 ),
++ MAP_CONST_TEXT( PROPERTY_FONTCHARSET, XmlNamespace::STYLE,
XML_FONT_CHARSET, XML_TYPE_TEXT_FONTENCODING, 0 ),
++ MAP_CONST_TEXT( PROPERTY_FONTFAMILY, XmlNamespace::STYLE,
XML_FONT_FAMILY_GENERIC, XML_TYPE_TEXT_FONTFAMILY, 0 ),
++ MAP_CONST_TEXT( PROPERTY_FONTHEIGHT, XmlNamespace::FO,
XML_FONT_SIZE, XML_TYPE_MEASURE16, 0 ),
++ MAP_CONST_TEXT( PROPERTY_FONTKERNING, XmlNamespace::STYLE,
XML_LETTER_KERNING, XML_TYPE_BOOL, 0 ),
++
++ MAP_CONST_TEXT( PROPERTY_FONTORIENTATION, XmlNamespace::STYLE,
XML_ROTATION_ANGLE, XML_TYPE_ROTATION_ANGLE, 0 ),
++ MAP_CONST_TEXT( PROPERTY_FONTPITCH, XmlNamespace::STYLE,
XML_FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, 0 ),
++ MAP_CONST_TEXT( PROPERTY_FONTSLANT, XmlNamespace::FO,
XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ),
++ MAP_CONST_TEXT( "CharStrikeout", XmlNamespace::STYLE,
XML_TEXT_LINE_THROUGH_STYLE,
XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0),
++ MAP_CONST_TEXT( "CharStrikeout", XmlNamespace::STYLE,
XML_TEXT_LINE_THROUGH_TYPE,
XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY, 0),
++ MAP_CONST_TEXT( "CharStrikeout", XmlNamespace::STYLE,
XML_TEXT_LINE_THROUGH_WIDTH,
XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0),
++ MAP_CONST_TEXT( "CharStrikeout", XmlNamespace::STYLE,
XML_TEXT_LINE_THROUGH_TEXT,
XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY, 0),
++ MAP_CONST_TEXT( PROPERTY_FONTSTYLENAME, XmlNamespace::STYLE,
XML_FONT_STYLE_NAME, XML_TYPE_STRING, 0 ),
++ MAP_CONST_TEXT( "CharUnderline", XmlNamespace::STYLE,
XML_TEXT_UNDERLINE_STYLE,
XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ),
++ MAP_CONST_TEXT( "CharUnderline", XmlNamespace::STYLE,
XML_TEXT_UNDERLINE_TYPE,
XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ),
++ MAP_CONST_TEXT( "CharUnderline", XmlNamespace::STYLE,
XML_TEXT_UNDERLINE_WIDTH,
XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ),
++ MAP_CONST_TEXT( "CharUnderlineColor", XmlNamespace::STYLE,
XML_TEXT_UNDERLINE_COLOR,
XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
++ MAP_CONST_TEXT( "CharUnderlineHasColor", XmlNamespace::STYLE,
XML_TEXT_UNDERLINE_COLOR,
XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
++ MAP_CONST_TEXT( PROPERTY_FONTWEIGHT, XmlNamespace::FO,
XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ),
++ MAP_CONST_TEXT( PROPERTY_FONTWIDTH, XmlNamespace::STYLE,
XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH, 0 ),
++ MAP_CONST_TEXT( PROPERTY_FONTWORDLINEMODE, XmlNamespace::STYLE,
XML_TEXT_UNDERLINE_MODE,
XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
+ MAP_END()
+ };
+ rtl::Reference < XMLPropertyHandlerFactory> xFac = new
/*OPropertyHandlerFactory*/::xmloff::OControlPropertyHandlerFactory();
+@@ -139,7 +139,7 @@ rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetRowStylesPropertySetMappe
+ #define MAP_CONST_ROW( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE_ROW, context,
SvtSaveOptions::ODFSVER_010, false }
+ static const XMLPropertyMapEntry s_aStylesProperties[] =
+ {
+- MAP_CONST_ROW( PROPERTY_ROW_HEIGHT, XML_NAMESPACE_STYLE,
XML_ROW_HEIGHT, XML_TYPE_MEASURE, 0),
++ MAP_CONST_ROW( PROPERTY_ROW_HEIGHT, XmlNamespace::STYLE,
XML_ROW_HEIGHT, XML_TYPE_MEASURE, 0),
+ MAP_END()
+ };
+ rtl::Reference < XMLPropertyHandlerFactory> xFac = new
OPropertyHandlerFactory();
+diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx
b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
+index ddd799087a48..0e8ebb208746 100644
+--- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx
++++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
+@@ -51,8 +51,8 @@ css::uno::Reference< css::xml::sax::XFastContextHandler >
OXMLTableFilterList::c
+ {
+ SvXMLImportContext *pContext = nullptr;
+
+- if ( IsTokenInNamespace(nElement, XML_NAMESPACE_DB) ||
+- IsTokenInNamespace(nElement, XML_NAMESPACE_DB_OASIS) )
++ if ( IsTokenInNamespace(nElement, XmlNamespace::DB) ||
++ IsTokenInNamespace(nElement, XmlNamespace::DB_OASIS) )
+ {
+ GetImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
+ switch (nElement & TOKEN_MASK)
+diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx
b/dbaccess/source/filter/xml/xmlfilter.cxx
+index bcf498e8c16e..23adc4d1cc84 100644
+--- a/dbaccess/source/filter/xml/xmlfilter.cxx
++++ b/dbaccess/source/filter/xml/xmlfilter.cxx
+@@ -181,11 +181,11 @@ ODBFilter::ODBFilter( const uno::Reference<
XComponentContext >& _rxContext )
+ GetMM100UnitConverter().SetXMLMeasureUnit(util::MeasureUnit::CM);
+ GetNamespaceMap().Add( "_db",
+ GetXMLToken(XML_N_DB),
+- XML_NAMESPACE_DB );
++ XmlNamespace::DB );
+
+ GetNamespaceMap().Add( "__db",
+ GetXMLToken(XML_N_DB_OASIS),
+- XML_NAMESPACE_DB );
++ XmlNamespace::DB );
+ }
+
+
+diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx
b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
+index 19a83eaf3bc3..ff177e13c4f3 100644
+--- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx
++++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
+@@ -39,7 +39,7 @@ SvXMLAutoCorrectExport::SvXMLAutoCorrectExport(
+ {
+ GetNamespaceMap_().Add( GetXMLToken ( XML_NP_BLOCK_LIST),
+ GetXMLToken ( XML_N_BLOCK_LIST ),
+- XML_NAMESPACE_BLOCKLIST );
++ XmlNamespace::BLOCKLIST );
+ }
+
+ ErrCode SvXMLAutoCorrectExport::exportDoc(enum XMLTokenEnum /*eClass*/)
+@@ -48,22 +48,22 @@ ErrCode SvXMLAutoCorrectExport::exportDoc(enum
XMLTokenEnum /*eClass*/)
+
+ addChaffWhenEncryptedStorage();
+
+- AddAttribute ( XML_NAMESPACE_NONE,
+- GetNamespaceMap_().GetAttrNameByKey (
XML_NAMESPACE_BLOCKLIST ),
+- GetNamespaceMap_().GetNameByKey ( XML_NAMESPACE_BLOCKLIST
) );
++ AddAttribute ( XmlNamespace::NONE,
++ GetNamespaceMap_().GetAttrNameByKey (
XmlNamespace::BLOCKLIST ),
++ GetNamespaceMap_().GetNameByKey ( XmlNamespace::BLOCKLIST
) );
+ {
+- SvXMLElementExport aRoot (*this, XML_NAMESPACE_BLOCKLIST,
XML_BLOCK_LIST, true, true);
++ SvXMLElementExport aRoot (*this, XmlNamespace::BLOCKLIST,
XML_BLOCK_LIST, true, true);
+ const SvxAutocorrWordList::AutocorrWordSetType& rContent =
pAutocorr_List->getSortedContent();
+ for (auto const& content : rContent)
+ {
+- AddAttribute( XML_NAMESPACE_BLOCKLIST,
++ AddAttribute( XmlNamespace::BLOCKLIST,
+ XML_ABBREVIATED_NAME,
+ content.GetShort());
+- AddAttribute( XML_NAMESPACE_BLOCKLIST,
++ AddAttribute( XmlNamespace::BLOCKLIST,
+ XML_NAME,
+ content.IsTextOnly() ? content.GetLong() :
content.GetShort());
+
+- SvXMLElementExport aBlock( *this, XML_NAMESPACE_BLOCKLIST,
XML_BLOCK, true, true);
++ SvXMLElementExport aBlock( *this, XmlNamespace::BLOCKLIST,
XML_BLOCK, true, true);
+ }
+ }
+ GetDocHandler()->endDocument();
+@@ -80,7 +80,7 @@ SvXMLExceptionListExport::SvXMLExceptionListExport(
+ {
+ GetNamespaceMap_().Add( GetXMLToken ( XML_NP_BLOCK_LIST ),
+ GetXMLToken ( XML_N_BLOCK_LIST ),
+- XML_NAMESPACE_BLOCKLIST );
++ XmlNamespace::BLOCKLIST );
+ }
+
+ ErrCode SvXMLExceptionListExport::exportDoc(enum XMLTokenEnum /*eClass*/)
+@@ -89,18 +89,18 @@ ErrCode SvXMLExceptionListExport::exportDoc(enum
XMLTokenEnum /*eClass*/)
+
+ addChaffWhenEncryptedStorage();
+
+- AddAttribute ( XML_NAMESPACE_NONE,
+- GetNamespaceMap_().GetAttrNameByKey (
XML_NAMESPACE_BLOCKLIST ),
+- GetNamespaceMap_().GetNameByKey ( XML_NAMESPACE_BLOCKLIST
) );
++ AddAttribute ( XmlNamespace::NONE,
++ GetNamespaceMap_().GetAttrNameByKey (
XmlNamespace::BLOCKLIST ),
++ GetNamespaceMap_().GetNameByKey ( XmlNamespace::BLOCKLIST
) );
+ {
+- SvXMLElementExport aRoot (*this, XML_NAMESPACE_BLOCKLIST,
XML_BLOCK_LIST, true, true);
++ SvXMLElementExport aRoot (*this, XmlNamespace::BLOCKLIST,
XML_BLOCK_LIST, true, true);
+ sal_uInt16 nBlocks= rList.size();
+ for ( sal_uInt16 i = 0; i < nBlocks; i++)
+ {
+- AddAttribute( XML_NAMESPACE_BLOCKLIST,
++ AddAttribute( XmlNamespace::BLOCKLIST,
+ XML_ABBREVIATED_NAME,
+ rList[i] );
+- SvXMLElementExport aBlock( *this, XML_NAMESPACE_BLOCKLIST,
XML_BLOCK, true, true);
++ SvXMLElementExport aBlock( *this, XmlNamespace::BLOCKLIST,
XML_BLOCK, true, true);
+ }
+ }
+ GetDocHandler()->endDocument();
+diff --git a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx
b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx
+index 69030fd38ab4..e475966c885c 100644
+--- a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx
++++ b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx
+@@ -23,11 +23,11 @@ using namespace ::xmloff::token;
+
+ enum SvXMLAutoCorrectToken : sal_Int32
+ {
+- NAMESPACE = FastToken::NAMESPACE | XML_NAMESPACE_BLOCKLIST, //65553
+- ABBREVIATED_NAME = FastToken::NAMESPACE | XML_NAMESPACE_BLOCKLIST |
XML_ABBREVIATED_NAME, //65655
+- BLOCK = FastToken::NAMESPACE | XML_NAMESPACE_BLOCKLIST | XML_BLOCK,
//65791
+- BLOCKLIST = FastToken::NAMESPACE | XML_NAMESPACE_BLOCKLIST |
XML_BLOCK_LIST, //65792
+- NAME = FastToken::NAMESPACE | XML_NAMESPACE_BLOCKLIST | XML_NAME
//66737
++ NAMESPACE = FastToken::NAMESPACE | XmlNamespace::BLOCKLIST, //65553
++ ABBREVIATED_NAME = FastToken::NAMESPACE | XmlNamespace::BLOCKLIST |
XML_ABBREVIATED_NAME, //65655
++ BLOCK = FastToken::NAMESPACE | XmlNamespace::BLOCKLIST | XML_BLOCK,
//65791
++ BLOCKLIST = FastToken::NAMESPACE | XmlNamespace::BLOCKLIST |
XML_BLOCK_LIST, //65792
++ NAME = FastToken::NAMESPACE | XmlNamespace::BLOCKLIST | XML_NAME
//66737
+ };
+
+ class SvXMLAutoCorrectTokenHandler :
+diff --git a/editeng/source/xml/xmltxtimp.cxx
b/editeng/source/xml/xmltxtimp.cxx
+index 56ff3dd137ab..c02d76d315a9 100644
+--- a/editeng/source/xml/xmltxtimp.cxx
++++ b/editeng/source/xml/xmltxtimp.cxx
+@@ -90,11 +90,11 @@ css::uno::Reference< css::xml::sax::XFastContextHandler >
SvxXMLTextImportContex
+ SvXMLImportContextRef SvxXMLTextImportContext::CreateChildContext( sal_uInt16
nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >&
xAttrList )
+ {
+ SvXMLImportContext* pContext = nullptr;
+- if(XML_NAMESPACE_OFFICE == nPrefix && IsXMLToken( rLocalName, XML_BODY ) )
++ if(XmlNamespace::OFFICE == nPrefix && IsXMLToken( rLocalName, XML_BODY ) )
+ {
+ // dealt with in createFastChildContext
+ }
+- else if( XML_NAMESPACE_OFFICE == nPrefix && IsXMLToken( rLocalName,
XML_AUTOMATIC_STYLES ) )
++ else if( XmlNamespace::OFFICE == nPrefix && IsXMLToken( rLocalName,
XML_AUTOMATIC_STYLES ) )
+ {
+ // dealt with in createFastChildContext
+ }
+diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
+index f28d9811cf64..e5082e06ccc4 100644
+--- a/filter/source/svg/svgexport.cxx
++++ b/filter/source/svg/svgexport.cxx
+@@ -125,7 +125,7 @@ public:
+ virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets
) const = 0;
+ virtual void elementExport( SVGExport* pSVGExport ) const
+ {
+- pSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", getClassName()
);
++ pSVGExport->AddAttribute( XmlNamespace::NONE, "class", getClassName()
);
+ }
+ void insertMasterPage( const Reference< css::drawing::XDrawPage>&
xMasterPage )
+ {
+@@ -169,7 +169,7 @@ public:
+ virtual void elementExport( SVGExport* pSVGExport ) const override
+ {
+ TextField::elementExport( pSVGExport );
+- SvXMLElementExport aExp( *pSVGExport, XML_NAMESPACE_NONE, "g", true,
true );
++ SvXMLElementExport aExp( *pSVGExport, XmlNamespace::NONE, "g", true,
true );
+ pSVGExport->GetDocHandler()->characters( text );
+ }
+ };
+@@ -297,8 +297,8 @@ public:
+
+ OUString sDateTimeFormat = sDateFormat + " " + sTimeFormat;
+
+- pSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX
"date-time-format", sDateTimeFormat );
+- SvXMLElementExport aExp( *pSVGExport, XML_NAMESPACE_NONE, "g", true,
true );
++ pSVGExport->AddAttribute( XmlNamespace::NONE, NSPREFIX
"date-time-format", sDateTimeFormat );
++ SvXMLElementExport aExp( *pSVGExport, XmlNamespace::NONE, "g", true,
true );
+ }
+ virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets
) const override
+ {
+@@ -367,17 +367,17 @@ SVGExport::SVGExport(
+ GetNamespaceMap_().Add(
+ GetXMLToken(XML_NP_PRESENTATION),
+ GetXMLToken(XML_N_PRESENTATION),
+- XML_NAMESPACE_PRESENTATION);
++ XmlNamespace::PRESENTATION);
+
+ GetNamespaceMap_().Add(
+ GetXMLToken(XML_NP_SMIL),
+ GetXMLToken(XML_N_SMIL_COMPAT),
+- XML_NAMESPACE_SMIL);
++ XmlNamespace::SMIL);
+
+ GetNamespaceMap_().Add(
+ GetXMLToken(XML_NP_ANIMATION),
+ GetXMLToken(XML_N_ANIMATION),
+- XML_NAMESPACE_ANIMATION);
++ XmlNamespace::ANIMATION);
+ }
+
+ SVGExport::~SVGExport()
+@@ -900,10 +900,10 @@ void
SVGFilter::implExportDocumentHeaderImpressOrDraw(sal_Int32 nDocX, sal_Int32
+ xExtDocHandler->unknown( SVG_DTD_STRING );
+ }
+
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "version", "1.2" );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "version", "1.2" );
+
+ if( mpSVGExport->IsUseTinyProfile() )
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "baseProfile", "tiny"
);
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "baseProfile", "tiny"
);
+
+ // The following if block means that the slide size is not adapted
+ // to the size of the browser window, moreover the slide is top left
aligned
+@@ -912,10 +912,10 @@ void
SVGFilter::implExportDocumentHeaderImpressOrDraw(sal_Int32 nDocX, sal_Int32
+ if( !mbPresentation )
+ {
+ aAttr = OUString::number( nDocWidth * 0.01 ) + "mm";
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "width", aAttr );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "width", aAttr );
+
+ aAttr = OUString::number( nDocHeight * 0.01 ) + "mm";
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "height", aAttr );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "height", aAttr );
+ }
+
+ // #i124608# set viewBox explicitly to the exported content
+@@ -930,56 +930,56 @@ void
SVGFilter::implExportDocumentHeaderImpressOrDraw(sal_Int32 nDocX, sal_Int32
+
+ aAttr += OUString::number(nDocWidth) + " " + OUString::number(nDocHeight);
+
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "viewBox", aAttr );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "preserveAspectRatio",
"xMidYMid" );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "fill-rule", "evenodd" );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "viewBox", aAttr );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "preserveAspectRatio",
"xMidYMid" );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "fill-rule", "evenodd" );
+
+ // standard line width is based on 1 pixel on a 90 DPI device (0.28222mmm)
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-width",
OUString::number( 28.222 ) );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-linejoin", "round"
);
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns", constSvgNamespace
);
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:ooo",
"http://xml.openoffice.org/svg/export"; );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:xlink",
"http://www.w3.org/1999/xlink"; );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:presentation",
"http://sun.com/xmlns/staroffice/presentation"; );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:smil",
"http://www.w3.org/2001/SMIL20/"; );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:anim",
"urn:oasis:names:tc:opendocument:xmlns:animation:1.0" );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xml:space", "preserve" );
+-
+- mpSVGDoc = new SvXMLElementExport( *mpSVGExport, XML_NAMESPACE_NONE,
"svg", true, true );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "stroke-width",
OUString::number( 28.222 ) );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "stroke-linejoin", "round"
);
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "xmlns", constSvgNamespace
);
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "xmlns:ooo",
"http://xml.openoffice.org/svg/export"; );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "xmlns:xlink",
"http://www.w3.org/1999/xlink"; );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "xmlns:presentation",
"http://sun.com/xmlns/staroffice/presentation"; );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "xmlns:smil",
"http://www.w3.org/2001/SMIL20/"; );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "xmlns:anim",
"urn:oasis:names:tc:opendocument:xmlns:animation:1.0" );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "xml:space", "preserve" );
++
++ mpSVGDoc = new SvXMLElementExport( *mpSVGExport, XmlNamespace::NONE,
"svg", true, true );
+
+ // Create a ClipPath element that will be used for cutting bitmaps and
other elements that could exceed the page margins.
+ if(mbExportShapeSelection)
+ return;
+
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "ClipPathGroup" );
+- SvXMLElementExport aDefsElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs",
true, true );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "class", "ClipPathGroup" );
++ SvXMLElementExport aDefsElem( *mpSVGExport, XmlNamespace::NONE, "defs",
true, true );
+ {
+ msClipPathId = "presentation_clip_path";
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", msClipPathId );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "clipPathUnits",
"userSpaceOnUse" );
+- SvXMLElementExport aClipPathElem( *mpSVGExport, XML_NAMESPACE_NONE,
"clipPath", true, true );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "id", msClipPathId );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "clipPathUnits",
"userSpaceOnUse" );
++ SvXMLElementExport aClipPathElem( *mpSVGExport, XmlNamespace::NONE,
"clipPath", true, true );
+ {
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "x",
OUString::number( nDocX ) );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "y",
OUString::number( nDocY ) );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "width",
OUString::number( nDocWidth ) );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "height",
OUString::number( nDocHeight ) );
+- SvXMLElementExport aRectElem( *mpSVGExport, XML_NAMESPACE_NONE,
"rect", true, true );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "x",
OUString::number( nDocX ) );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "y",
OUString::number( nDocY ) );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "width",
OUString::number( nDocWidth ) );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "height",
OUString::number( nDocHeight ) );
++ SvXMLElementExport aRectElem( *mpSVGExport, XmlNamespace::NONE,
"rect", true, true );
+ }
+ }
+ // Create a ClipPath element applied to the leaving slide in order
+ // to avoid that slide borders are visible during transition
+ {
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id",
"presentation_clip_path_shrink" );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "clipPathUnits",
"userSpaceOnUse" );
+- SvXMLElementExport aClipPathElem( *mpSVGExport, XML_NAMESPACE_NONE,
"clipPath", true, true );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "id",
"presentation_clip_path_shrink" );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "clipPathUnits",
"userSpaceOnUse" );
++ SvXMLElementExport aClipPathElem( *mpSVGExport, XmlNamespace::NONE,
"clipPath", true, true );
+ {
+ sal_Int32 nDocWidthExt = nDocWidth / 500;
+ sal_Int32 nDocHeightExt = nDocHeight / 500;
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "x",
OUString::number( nDocX + nDocWidthExt / 2 ) );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "y",
OUString::number( nDocY + nDocHeightExt / 2) );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "width",
OUString::number( nDocWidth - nDocWidthExt ) );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "height",
OUString::number( nDocHeight - nDocHeightExt ) );
+- SvXMLElementExport aRectElem( *mpSVGExport, XML_NAMESPACE_NONE,
"rect", true, true );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "x",
OUString::number( nDocX + nDocWidthExt / 2 ) );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "y",
OUString::number( nDocY + nDocHeightExt / 2) );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "width",
OUString::number( nDocWidth - nDocWidthExt ) );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "height",
OUString::number( nDocHeight - nDocHeightExt ) );
++ SvXMLElementExport aRectElem( *mpSVGExport, XmlNamespace::NONE,
"rect", true, true );
+ }
+ }
+ }
+@@ -988,32 +988,32 @@ void
SVGFilter::implExportDocumentHeaderWriterOrCalc(sal_Int32 nDocX, sal_Int32
+ sal_Int32 nDocWidth, sal_Int32
nDocHeight)
+ {
+ OUString aAttr;
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "version", "1.2" );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "version", "1.2" );
+
+ aAttr = OUString::number( nDocWidth * 0.01 ) + "mm";
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "width", aAttr );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "width", aAttr );
+
+ aAttr = OUString::number( nDocHeight * 0.01 ) + "mm";
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "height", aAttr );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "height", aAttr );
+
+ aAttr = OUString::number(nDocX) + " " + OUString::number(nDocY) + " " +
+ OUString::number(nDocWidth) + " " + OUString::number(nDocHeight);
+
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "viewBox", aAttr );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "preserveAspectRatio",
"xMidYMid" );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "fill-rule", "evenodd" );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "viewBox", aAttr );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "preserveAspectRatio",
"xMidYMid" );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "fill-rule", "evenodd" );
+
+ // standard line width is based on 1 pixel on a 90 DPI device (0.28222mmm)
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-width",
OUString::number( 28.222 ) );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-linejoin", "round"
);
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns", constSvgNamespace
);
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:ooo",
"http://xml.openoffice.org/svg/export"; );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:xlink",
"http://www.w3.org/1999/xlink"; );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:office",
"urn:oasis:names:tc:opendocument:xmlns:office:1.0" );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:smil",
"urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" );
+- mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xml:space", "preserve" );
+-
+- mpSVGDoc = new SvXMLElementExport( *mpSVGExport, XML_NAMESPACE_NONE,
"svg", true, true );
++ mpSVGExport->AddAttribute( XmlNamespace::NONE, "stroke-width",
OUString::number( 28.222 ) );
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
