diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-26 10:18:14 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-27 09:36:53 +0100 |
commit | aa753f01ba4631614bb88ee7d3a3e6b222208b3e (patch) | |
tree | c8b168e8e0619c387d30f206848ec30ca7238a00 /cui | |
parent | Avoid WaE (-Wunused-macros) in external libpng (diff) | |
download | core-aa753f01ba4631614bb88ee7d3a3e6b222208b3e.tar.gz core-aa753f01ba4631614bb88ee7d3a3e6b222208b3e.zip |
-Wunused-macros
Change-Id: Ifaa1637122d6f9cae1e29b77ac36ca5d1f220aed
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/dlgname.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optgdlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/options/optgenrl.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optlingu.cxx | 1 | ||||
-rw-r--r-- | cui/source/options/treeopt.cxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/macroass.cxx | 5 | ||||
-rw-r--r-- | cui/source/tabpages/numpages.cxx | 2 |
7 files changed, 4 insertions, 18 deletions
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index c8417713f6e1..650e39a53297 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -26,8 +26,6 @@ #include "defdlgname.hxx" #include <dialmgr.hxx> -#define MAX_DESCRIPTION_LINES ((long)5) - /************************************************************************* |* |* Dialog for editing a name diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index fd1ffcdaf43f..d9f214684eff 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1781,11 +1781,11 @@ IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*, pEd ) } else { - // color to use as foreground for an invalid pattern - #define INVALID_PATTERN_FOREGROUND_COLOR Color(COL_WHITE) // color to use as background for an invalid pattern #define INVALID_PATTERN_BACKGROUND_COLOR Color(0xff6563) #if 0 + // color to use as foreground for an invalid pattern + #define INVALID_PATTERN_FOREGROUND_COLOR Color(COL_WHITE) //! Gives white on white!?! pEd->SetControlBackground( INVALID_PATTERN_BACKGROUND_COLOR); pEd->SetControlForeground( INVALID_PATTERN_FOREGROUND_COLOR); diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 3da87b0f34c1..d2e3a11dbb5d 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -26,8 +26,6 @@ #include <svl/intitem.hxx> #include <vcl/edit.hxx> -#define SVX_OPTGENRL_CXX - #include <cuires.hrc> #include <unotools/useroptions.hxx> #include "cuioptgenrl.hxx" diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index c794bdd2e0e8..d7e68f85a029 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -82,7 +82,6 @@ using namespace ::com::sun::star::beans; #define CBCOL_FIRST 0 #define CBCOL_SECOND 1 -#define CBCOL_BOTH 2 static const sal_Char cSpell[] = SN_SPELLCHECKER; static const sal_Char cGrammar[] = SN_GRAMMARCHECKER; diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 5de1ae771cbb..eb382088837c 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -60,6 +60,7 @@ #include <com/sun/star/loader/CannotActivateFactoryException.hpp> #include <com/sun/star/util/theMacroExpander.hpp> #include <comphelper/processfactory.hxx> +#include <editeng/langitem.hxx> #include <editeng/optitems.hxx> #include <editeng/unolingu.hxx> #include <linguistic/misc.hxx> @@ -94,11 +95,6 @@ #include <vcl/waitobj.hxx> #include "svtools/treelistentry.hxx" -#ifndef _SVX_LANGITEM_HXX -#define ITEMID_LANGUAGE SID_ATTR_CHAR_LANGUAGE -#include <editeng/langitem.hxx> -#endif - #ifdef LINUX #include <sys/stat.h> #endif diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 60df6197415b..5fc05943e37c 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define ITEMID_MACRO 0 -#include <svl/macitem.hxx> -#undef ITEMID_MACRO - #include "macroass.hxx" #include <basic/basmgr.hxx> #include <comphelper/string.hxx> #include <dialmgr.hxx> +#include <svl/macitem.hxx> #include <svx/dialogs.hrc> #include <svtools/svmedit.hxx> #include "cfgutil.hxx" diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 07aac6ff64f4..f7c8aab03be7 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -83,8 +83,6 @@ using namespace com::sun::star::style; #define NUM_PAGETYPE_BULLET 0 #define NUM_PAGETYPE_SINGLENUM 1 #define NUM_PAGETYPE_NUM 2 -#define NUM_PAGETYPE_BMP 3 -#define PAGETYPE_USER_START 10 #define SHOW_NUMBERING 0 #define SHOW_BULLET 1 |