basic/inc/global.hxx | 25 ++++ basic/inc/sb.hxx | 3 basic/inc/sbobjmod.hxx | 104 ++++++++++++++++++++ basic/inc/sbprop.hxx | 67 +++++++++++++ basic/inc/sbstdobj.hxx | 136 +++++++++++++++++++++++++++ basic/inc/sbxbase.hxx | 52 ++++++++++ basic/source/basmgr/basmgr.cxx | 2 basic/source/classes/global.cxx | 3 basic/source/classes/sb.cxx | 2 basic/source/classes/sbxmod.cxx | 2 basic/source/comp/sbcomp.cxx | 2 basic/source/runtime/methods.cxx | 4 basic/source/runtime/methods1.cxx | 2 basic/source/runtime/stdobj.cxx | 2 basic/source/runtime/stdobj1.cxx | 2 basic/source/sbx/sbxbase.cxx | 2 basic/source/sbx/sbxscan.cxx | 2 include/basic/global.hxx | 25 ---- include/basic/sbobjmod.hxx | 104 -------------------- include/basic/sbprop.hxx | 67 ------------- include/basic/sbstdobj.hxx | 136 --------------------------- include/basic/sbxbase.hxx | 52 ---------- sw/source/filter/ww8/docxattributeoutput.cxx | 3 23 files changed, 399 insertions(+), 400 deletions(-)
New commits: commit 4b0f171b24da9b746fc7cc869aeddbd476df937e Author: Tor Lillqvist <[email protected]> Date: Wed Dec 11 10:49:57 2013 +0200 sbxbase.hxx is private to basic Change-Id: I108bd247a40ce2b46034cabe8b075fa4f5a396df diff --git a/include/basic/sbxbase.hxx b/basic/inc/sbxbase.hxx similarity index 93% rename from include/basic/sbxbase.hxx rename to basic/inc/sbxbase.hxx index 88c7380..597f292 100644 --- a/include/basic/sbxbase.hxx +++ b/basic/inc/sbxbase.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_BASIC_SBXBASE_HXX -#define INCLUDED_BASIC_SBXBASE_HXX +#ifndef INCLUDED_BASIC_INC_SBXBASE_HXX +#define INCLUDED_BASIC_INC_SBXBASE_HXX #include <i18nlangtag/lang.h> #include <basic/sbxdef.hxx> @@ -47,6 +47,6 @@ struct SbxAppData BASIC_DLLPUBLIC SbxAppData& GetSbxData_Impl(); -#endif +#endif // INCLUDED_BASIC_INC_SBXBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 07b94b3..cc95d5b 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -22,7 +22,7 @@ #include <basic/sbx.hxx> #include <basic/sbxfac.hxx> -#include <basic/sbxbase.hxx> +#include "sbxbase.hxx" #include <rtl/instance.hxx> #include <rtl/ustring.hxx> diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index d16ffcb..15c5074 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -31,7 +31,7 @@ #include <ctype.h> #include "sbxres.hxx" -#include <basic/sbxbase.hxx> +#include "sbxbase.hxx" #include <basic/sbxfac.hxx> #include <basic/sbxform.hxx> #include <svtools/svtools.hrc> commit d76178b52dc6ab4a9bf22a6051264215a91935cf Author: Tor Lillqvist <[email protected]> Date: Wed Dec 11 10:48:12 2013 +0200 sbstdobj.hxx is private to basic Change-Id: I131dfeded783edfea94208d1cf8d70a2090785fa diff --git a/include/basic/sbstdobj.hxx b/basic/inc/sbstdobj.hxx similarity index 97% rename from include/basic/sbstdobj.hxx rename to basic/inc/sbstdobj.hxx index 44c9230..9bb855e 100644 --- a/include/basic/sbstdobj.hxx +++ b/basic/inc/sbstdobj.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SBSTDOBJ1_HXX -#define _SBSTDOBJ1_HXX +#ifndef INCLUDED_BASIC_INC_SBSTDOBJ_HXX +#define INCLUDED_BASIC_INC_SBSTDOBJ_HXX #include <basic/sbxobj.hxx> #include <vcl/graph.hxx> @@ -131,6 +131,6 @@ public: virtual SbxVariable* Find( const OUString&, SbxClassType ); }; -#endif +#endif // INCLUDED_BASIC_INC_SBSTDOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 017364a..86ae936 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -64,7 +64,7 @@ using namespace com::sun::star::uno; #include "date.hxx" #include "stdobj.hxx" -#include <basic/sbstdobj.hxx> +#include "sbstdobj.hxx" #include "rtlproto.hxx" #include "basrid.hxx" #include "image.hxx" diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index e058f01..43fd11cb 100644 --- a/basic/source/runtime/stdobj.cxx +++ b/basic/source/runtime/stdobj.cxx @@ -20,7 +20,7 @@ #include "runtime.hxx" #include "stdobj.hxx" -#include <basic/sbstdobj.hxx> +#include "sbstdobj.hxx" #include <sal/macros.h> #include "rtlproto.hxx" #include "sbintern.hxx" diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx index 20a1a85..629470f 100644 --- a/basic/source/runtime/stdobj1.cxx +++ b/basic/source/runtime/stdobj1.cxx @@ -21,7 +21,7 @@ #include <vcl/svapp.hxx> #include <svtools/transfer.hxx> #include "runtime.hxx" -#include <basic/sbstdobj.hxx> +#include "sbstdobj.hxx" #define ATTR_IMP_TYPE 1 #define ATTR_IMP_WIDTH 2 commit 444aaceb15bbfcf679a2baaa5b8370ad5e035d79 Author: Tor Lillqvist <[email protected]> Date: Wed Dec 11 10:45:57 2013 +0200 sbprop.hxx is private to basic Change-Id: I1d7a28652ee7743b6823d78e1565338a324f0a6a diff --git a/basic/inc/sb.hxx b/basic/inc/sb.hxx index 52204b9..6a3c2f7 100644 --- a/basic/inc/sb.hxx +++ b/basic/inc/sb.hxx @@ -24,9 +24,10 @@ #include <basic/sbdef.hxx> #include <basic/sbmeth.hxx> #include <basic/sbmod.hxx> -#include <basic/sbprop.hxx> #include <basic/sbstar.hxx> +#include "sbprop.hxx" + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basic/sbprop.hxx b/basic/inc/sbprop.hxx similarity index 94% rename from include/basic/sbprop.hxx rename to basic/inc/sbprop.hxx index a551f6c..c65fe26 100644 --- a/include/basic/sbprop.hxx +++ b/basic/inc/sbprop.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_BASIC_SBPROP_HXX -#define INCLUDED_BASIC_SBPROP_HXX +#ifndef INCLUDED_BASIC_INC_SBPROP_HXX +#define INCLUDED_BASIC_INC_SBPROP_HXX #include <basic/sbxprop.hxx> #include <basic/sbdef.hxx> @@ -62,6 +62,6 @@ public: { mbSet = bSet; } }; -#endif +#endif // INCLUDED_BASIC_INC_SBPROP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 69e1370428a04f2e95cad3da02c1548f0519d3e3 Author: Tor Lillqvist <[email protected]> Date: Wed Dec 11 10:42:17 2013 +0200 WaE: unused variables [loplugin] Change-Id: I7856fd7417ed2ae19774bd20d48b4a5232301728 diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index f580b77..8150e1c 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1482,9 +1482,6 @@ void DocxAttributeOutput::Redline( const SwRedlineData* pRedline) OString aAuthor( OUStringToOString( rAuthor, RTL_TEXTENCODING_UTF8 ) ); OString aDate( DateTimeToOString( pRedline->GetTimeStamp() ) ); - OUString sVal; - OString sOVal; - switch( pRedline->GetType() ) { case nsRedlineType_t::REDLINE_INSERT: commit 0a33e24d11938bf0f71e1a6ed1baa84100779f0e Author: Tor Lillqvist <[email protected]> Date: Wed Dec 11 10:39:57 2013 +0200 sbobjmod.hxx is private to basic Change-Id: I4ad28b049de5f7268ee1ca2e8992e2f29ed05380 diff --git a/include/basic/sbobjmod.hxx b/basic/inc/sbobjmod.hxx similarity index 96% rename from include/basic/sbobjmod.hxx rename to basic/inc/sbobjmod.hxx index faa560a..e7416cc 100644 --- a/include/basic/sbobjmod.hxx +++ b/basic/inc/sbobjmod.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_BASIC_SBOBJMOD_HXX -#define INCLUDED_BASIC_SBOBJMOD_HXX +#ifndef INCLUDED_BASIC_INC_SBOBJMOD_HXX +#define INCLUDED_BASIC_INC_SBOBJMOD_HXX #include <rtl/ref.hxx> #include <basic/sbmod.hxx> @@ -99,6 +99,6 @@ public: virtual SbxVariable* Find( const OUString& rName, SbxClassType t ); }; -#endif +#endif // INCLUDED_BASIC_INC_SBOBJMOD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 3bd3fd6..0e60e1b 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -35,7 +35,7 @@ #include "sbintern.hxx" #include "runtime.hxx" #include <basic/sbuno.hxx> -#include <basic/sbobjmod.hxx> +#include "sbobjmod.hxx" #include "stdobj.hxx" #include "filefmt.hxx" #include "sb.hrc" diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 0ef65e3..122d152 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -41,7 +41,7 @@ #include <basic/basrdll.hxx> #include <osl/mutex.hxx> -#include <basic/sbobjmod.hxx> +#include "sbobjmod.hxx" #include <basic/vbahelper.hxx> #include <cppuhelper/implbase3.hxx> #include <unotools/eventcfg.hxx> diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx index 190e534..043af20 100644 --- a/basic/source/comp/sbcomp.cxx +++ b/basic/source/comp/sbcomp.cxx @@ -21,7 +21,7 @@ #include <basic/sbx.hxx> #include "sbcomp.hxx" #include "image.hxx" -#include <basic/sbobjmod.hxx> +#include "sbobjmod.hxx" #include <svtools/miscopt.hxx> #include <stdio.h> diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 5351606..017364a 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -87,7 +87,7 @@ SbxVariable* getDefaultProp( SbxVariable* pRef ); #include <direct.h> #endif -#include <basic/sbobjmod.hxx> +#include "sbobjmod.hxx" #ifdef WNT #if defined _MSC_VER diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 78ac359..bf5ea96 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -32,7 +32,7 @@ #include <tools/urlobj.hxx> #include <osl/file.hxx> #include <vcl/jobset.hxx> -#include <basic/sbobjmod.hxx> +#include "sbobjmod.hxx" #include <basic/sbuno.hxx> #include "date.hxx" commit dde119c8f2c40249eaea13a5acf218357f7df4b4 Author: Tor Lillqvist <[email protected]> Date: Wed Dec 11 10:36:58 2013 +0200 basic/global.hxx is private to basic Change-Id: I90a28e34eb45819e240931cd751ac0a546ea6be8 diff --git a/include/basic/global.hxx b/basic/inc/global.hxx similarity index 82% rename from include/basic/global.hxx rename to basic/inc/global.hxx index 9d63c14..640759e 100644 --- a/include/basic/global.hxx +++ b/basic/inc/global.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_BASIC_GLOBAL_HXX -#define INCLUDED_BASIC_GLOBAL_HXX +#ifndef INCLUDED_BASIC_INC_GLOBAL_HXX +#define INCLUDED_BASIC_INC_GLOBAL_HXX namespace utl { class TransliterationWrapper; @@ -20,6 +20,6 @@ public: static utl::TransliterationWrapper& GetTransliteration(); }; -#endif +#endif // INCLUDED_BASIC_INC_GLOBAL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 96dc434..785dda6 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -37,7 +37,7 @@ #include <basic/sbuno.hxx> #include <basic/basmgr.hxx> -#include <basic/global.hxx> +#include "global.hxx" #include <sbunoobj.hxx> #include "basrid.hxx" #include "sbintern.hxx" diff --git a/basic/source/classes/global.cxx b/basic/source/classes/global.cxx index c486647..2efb9da 100644 --- a/basic/source/classes/global.cxx +++ b/basic/source/classes/global.cxx @@ -7,13 +7,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <basic/global.hxx> #include <comphelper/processfactory.hxx> #include <i18nlangtag/lang.h> #include <rtl/instance.hxx> #include <unotools/transliterationwrapper.hxx> #include <vcl/svapp.hxx> +#include "global.hxx" + namespace { class lclTransliterationWrapper _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
