diff options
22 files changed, 5 insertions, 4 deletions
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 1b919471115c..1b919471115c 100755..100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx index fcc1b046f2dd..fcc1b046f2dd 100755..100644 --- a/starmath/inc/toolbox.hxx +++ b/starmath/inc/toolbox.hxx diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi index 4b9eaedac599..4b9eaedac599 100755..100644 --- a/starmath/sdi/smath.sdi +++ b/starmath/sdi/smath.sdi diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi index 69cecf25f308..69cecf25f308 100755..100644 --- a/starmath/sdi/smslots.sdi +++ b/starmath/sdi/smslots.sdi diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index a33ab14a98bf..a33ab14a98bf 100755..100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx diff --git a/starmath/source/smres.src b/starmath/source/smres.src index 601472b62f5a..601472b62f5a 100644..100755 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src diff --git a/starmath/source/toolbox.hrc b/starmath/source/toolbox.hrc index 29adff303a3e..29adff303a3e 100755..100644 --- a/starmath/source/toolbox.hrc +++ b/starmath/source/toolbox.hrc diff --git a/starmath/source/toolbox.src b/starmath/source/toolbox.src index ead1b32810c3..ead1b32810c3 100755..100644 --- a/starmath/source/toolbox.src +++ b/starmath/source/toolbox.src diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml index 7c82d733fa70..7c82d733fa70 100755..100644 --- a/starmath/uiconfig/smath/menubar/menubar.xml +++ b/starmath/uiconfig/smath/menubar/menubar.xml diff --git a/sw/inc/dochdl.hrc b/sw/inc/dochdl.hrc index 47b0b8014240..47b0b8014240 100644..100755 --- a/sw/inc/dochdl.hrc +++ b/sw/inc/dochdl.hrc diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 3dd338a5e129..3dd338a5e129 100755..100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 0bbfc70d5a22..0bbfc70d5a22 100755..100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 0a6151b98388..0ab613730948 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -32,7 +32,7 @@ #include "wrtww8.hxx" #include "ww8par.hxx" -#include <oox/core/tokens.hxx> +#include <oox/token/tokens.hxx> #include <oox/export/drawingml.hxx> #include <oox/export/utils.hxx> #include <oox/export/vmlexport.hxx> @@ -128,6 +128,7 @@ using rtl::OUString; using rtl::OUStringBuffer; using rtl::OUStringToOString; +using namespace oox; using namespace docx; using namespace sax_fastparser; using namespace nsSwDocInfoSubType; diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 35c126cd6571..a4b5fb3a9514 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/i18n/ScriptType.hdl> -#include <oox/core/tokens.hxx> +#include <oox/token/tokens.hxx> #include <oox/export/drawingml.hxx> #include <oox/export/vmlexport.hxx> @@ -62,6 +62,7 @@ using namespace ::comphelper; using namespace ::com::sun::star; +using namespace ::oox; using oox::vml::VMLExport; diff --git a/sw/source/filter/ww8/docxfootnotes.hxx b/sw/source/filter/ww8/docxfootnotes.hxx index b9d49f78f560..ec91731bc6dd 100644 --- a/sw/source/filter/ww8/docxfootnotes.hxx +++ b/sw/source/filter/ww8/docxfootnotes.hxx @@ -30,7 +30,6 @@ #include <fmtftn.hxx> -#include <oox/core/tokens.hxx> #include <rtl/string.hxx> #include <rtl/ustring.hxx> #include <sax/fshelper.hxx> diff --git a/sw/source/ui/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src index f92ea43681d8..f92ea43681d8 100644..100755 --- a/sw/source/ui/dochdl/dochdl.src +++ b/sw/source/ui/dochdl/dochdl.src diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx index cc789d6e4498..cc789d6e4498 100644..100755 --- a/sw/source/ui/dochdl/gloshdl.cxx +++ b/sw/source/ui/dochdl/gloshdl.cxx diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index e9bb702b3d66..e9bb702b3d66 100755..100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx index 37d5e1ed5d69..37d5e1ed5d69 100755..100644 --- a/sw/source/ui/shells/langhelper.cxx +++ b/sw/source/ui/shells/langhelper.cxx diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 9a1ce729a4f6..5c440d55883e 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -182,7 +182,7 @@ void SwView::ImpSetVerb( int nSelType ) } if ( bResetVerbs ) { - SetVerbs( 0 ); + SetVerbs( Sequence< embed::VerbDescriptor >() ); bVerbsActive = sal_False; } } diff --git a/sw/source/ui/uiview/view.hrc b/sw/source/ui/uiview/view.hrc index d2aa60494801..d2aa60494801 100755..100644 --- a/sw/source/ui/uiview/view.hrc +++ b/sw/source/ui/uiview/view.hrc diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index b3f73f7c38e4..b3f73f7c38e4 100644..100755 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx |