[Libreoffice-commits] .: reportdesign/source sc/source starmath/source vcl/headless vcl/source vcl/unx vcl/win

Takeshi Abe tabe at kemper.freedesktop.org
Sat May 12 17:04:37 PDT 2012


 reportdesign/source/filter/xml/xmlStyleImport.cxx |    5 -----
 reportdesign/source/ui/misc/ColorListener.cxx     |    1 -
 reportdesign/source/ui/report/DesignView.cxx      |    1 -
 reportdesign/source/ui/report/ScrollHelper.cxx    |    1 -
 reportdesign/source/ui/report/SectionWindow.cxx   |    2 --
 sc/source/core/data/global.cxx                    |    5 -----
 sc/source/filter/xml/XMLExportDatabaseRanges.cxx  |    3 ---
 sc/source/filter/xml/xmlcelli.cxx                 |    2 --
 sc/source/filter/xml/xmldrani.cxx                 |    2 --
 sc/source/filter/xml/xmlexprt.cxx                 |    2 --
 sc/source/filter/xml/xmlimprt.cxx                 |    1 -
 sc/source/filter/xml/xmlrowi.cxx                  |    1 -
 sc/source/ui/docshell/dbdocimp.cxx                |    2 --
 sc/source/ui/formdlg/dwfunctr.cxx                 |    1 -
 sc/source/ui/vba/vbaworksheet.cxx                 |    1 -
 starmath/source/edit.cxx                          |    5 -----
 starmath/source/unomodel.cxx                      |    1 -
 starmath/source/view.cxx                          |    5 -----
 vcl/headless/svpframe.cxx                         |    3 ---
 vcl/source/components/rasterizer_rsvg.cxx         |    2 --
 vcl/source/control/ilstbox.cxx                    |    4 ----
 vcl/unx/generic/gdi/salbmp.cxx                    |    6 ------
 vcl/win/source/gdi/salgdi.cxx                     |    2 --
 23 files changed, 58 deletions(-)

New commits:
commit e3bc45b8079228ca25e70ac5a51b6977afd6f61e
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Sun May 13 08:51:05 2012 +0900

    removed unused defines
    
    Change-Id: Ida50737f540459bd0e709c49414c3a7f4d042a47

diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 3d21f34..e5d0beb 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -45,11 +45,6 @@
 #include "xmlHelper.hxx"
 #include <osl/diagnose.h>
 
-#define XML_LINE_LEFT 0
-#define XML_LINE_RIGHT 1
-#define XML_LINE_TOP 2
-#define XML_LINE_BOTTOM 3
-
 namespace rptxml
 {
 
diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx
index 5bcd48f..0c4971d 100644
--- a/reportdesign/source/ui/misc/ColorListener.cxx
+++ b/reportdesign/source/ui/misc/ColorListener.cxx
@@ -29,7 +29,6 @@
 #include <svl/smplhint.hxx>
 #include "uistrings.hrc"
 
-#define BORDERCOLORCHANGE 191
 //=====================================================================
 namespace rptui
 {
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index f66e4b7..1dbc751 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -59,7 +59,6 @@ using namespace lang;
 using namespace beans;
 using namespace container;
 
-#define LINE_SIZE           50
 #define START_SIZE_TASKPANE 30
 #define COLSET_ID           1
 #define REPORT_ID           2
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 998714b..e596900 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -37,7 +37,6 @@
 
 namespace rptui
 {
-#define LINE_SIZE           50
 #define SECTION_OFFSET      3
 #define SCR_LINE_SIZE       10
 using namespace ::com::sun::star;
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 37a7e6f..7d2bb64 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -50,8 +50,6 @@
 
 namespace rptui
 {
-#define SECTION_OFFSET  3
-
 using namespace ::com::sun::star;
 using namespace ::comphelper;
 
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 9a3de10..6ecf6ec 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -106,11 +106,6 @@ using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
 using namespace ::com::sun::star;
 
-#define CLIPST_AVAILABLE    0
-#define CLIPST_CAPTURED     1
-#define CLIPST_DELETE       2
-#define CLIPST_DRAW         3
-
 ScDocShellRef*  ScGlobal::pDrawClipDocShellRef = NULL;
 SvxSearchItem*  ScGlobal::pSearchItem = NULL;
 ScAutoFormat*   ScGlobal::pAutoFormat = NULL;
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index d8c4979..59d1e2c 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -64,9 +64,6 @@
 
 //! not found in unonames.hxx
 #define SC_USERLIST "UserList"
-#define SC_SORTASCENDING "SortAscending"
-#define SC_ENABLEUSERSORTLIST "EnableUserSortList"
-#define SC_USERSORTLISTINDEX "UserSortListIndex"
 
 using namespace com::sun::star;
 using namespace xmloff::token;
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index c75991a..dcab782 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -91,8 +91,6 @@
 #include <i18npool/lang.h>
 #include <comphelper/extract.hxx>
 
-#define SC_CURRENCYSYMBOL   "CurrencySymbol"
-
 using namespace com::sun::star;
 using namespace xmloff::token;
 
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index c622255..464db27 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -67,8 +67,6 @@
 
 #include <memory>
 
-#define SC_ENABLEUSERSORTLIST   "EnableUserSortList"
-#define SC_USERSORTLISTINDEX    "UserSortListIndex"
 #define SC_USERLIST             "UserList"
 
 using namespace com::sun::star;
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 531a5c5..2c6316c 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -139,10 +139,8 @@
 #include <vector>
 
 //! not found in unonames.hxx
-#define SC_STANDARDFORMAT "StandardFormat"
 #define SC_LAYERID "LayerID"
 
-#define SC_DEFAULT_TABLE_COUNT                      3
 #define SC_VIEWCHANGES_COUNT                        13
 #define SC_SHOW_CHANGES                             0
 #define SC_SHOW_ACCEPTED_CHANGES                    1
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 8114203..673b1f2 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -98,7 +98,6 @@
 #define SC_LOCALE           "Locale"
 #define SC_STANDARDFORMAT   "StandardFormat"
 #define SC_CURRENCYSYMBOL   "CurrencySymbol"
-#define SC_NAMEDRANGES      "NamedRanges"
 #define SC_REPEAT_COLUMN "repeat-column"
 #define SC_REPEAT_ROW "repeat-row"
 #define SC_FILTER "filter"
diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx
index edfe4e5..ac6af17 100644
--- a/sc/source/filter/xml/xmlrowi.cxx
+++ b/sc/source/filter/xml/xmlrowi.cxx
@@ -54,7 +54,6 @@
 #include <com/sun/star/table/CellAddress.hpp>
 
 #define SC_ISVISIBLE "IsVisible"
-#define SC_OPTIMALHEIGHT "OptimalHeight"
 #define SC_ISFILTERED "IsFiltered"
 
 using namespace com::sun::star;
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index 92f6b45..3f0e80c 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -77,8 +77,6 @@ using namespace com::sun::star;
 #define SC_DBPROP_DATASOURCENAME    "DataSourceName"
 #define SC_DBPROP_COMMAND           "Command"
 #define SC_DBPROP_COMMANDTYPE       "CommandType"
-#define SC_DBPROP_SELECTION         "Selection"
-#define SC_DBPROP_CURSOR            "Cursor"
 
 void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFrame )
 {
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 703b218..1356fe1 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -51,7 +51,6 @@
 
 // -----------------------------------------------------------------------
 
-#define ARG_SEPERATOR String("; ")
 SFX_IMPL_DOCKINGWINDOW( ScFunctionChildWindow, FID_FUNCTION_BOX )
 
 /*************************************************************************
diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx
index 13f1c4d..9b2ec48 100644
--- a/sc/source/ui/vba/vbaworksheet.cxx
+++ b/sc/source/ui/vba/vbaworksheet.cxx
@@ -114,7 +114,6 @@
 
 #define STANDARDWIDTH 2267
 #define STANDARDHEIGHT 427
-#define DOESNOTEXIST -1
 
 using namespace com::sun::star;
 using namespace ooo::vba;
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 547e488..98bed65 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -66,11 +66,6 @@
 
 #define SCROLL_LINE         24
 
-#define MINWIDTH        200
-#define MINHEIGHT       200
-#define MINSPLIT        40
-#define SPLITTERWIDTH   2
-
 
 using namespace com::sun::star::accessibility;
 using namespace com::sun::star;
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 67c7cc6..f25ff42 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -164,7 +164,6 @@ SmPrintUIOptions::SmPrintUIOptions()
 
 // values from com/sun/star/beans/PropertyAttribute
 #define PROPERTY_NONE        0
-#define PROPERTY_READONLY   16
 
 enum SmModelPropertyHandles
 {
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 50e948c..8b2d602 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -82,11 +82,6 @@
 #include "cursor.hxx"
 #include "accessibility.hxx"
 
-#define MINWIDTH        200
-#define MINHEIGHT       200
-#define MINSPLIT        40
-#define SPLITTERWIDTH       2
-
 #define MINZOOM         25
 #define MAXZOOM         800
 
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index fcaed35..63f4a49 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -315,9 +315,6 @@ SalFrame* SvpSalFrame::GetParent() const
 #define _FRAMESTATE_MASK_GEOMETRY \
      (SAL_FRAMESTATE_MASK_X     | SAL_FRAMESTATE_MASK_Y |   \
       SAL_FRAMESTATE_MASK_WIDTH | SAL_FRAMESTATE_MASK_HEIGHT)
-#define _FRAMESTATE_MASK_MAXIMIZED_GEOMETRY \
-     (SAL_FRAMESTATE_MASK_MAXIMIZED_X     | SAL_FRAMESTATE_MASK_MAXIMIZED_Y |   \
-      SAL_FRAMESTATE_MASK_MAXIMIZED_WIDTH | SAL_FRAMESTATE_MASK_MAXIMIZED_HEIGHT)
 
 void SvpSalFrame::SetWindowState( const SalFrameState *pState )
 {
diff --git a/vcl/source/components/rasterizer_rsvg.cxx b/vcl/source/components/rasterizer_rsvg.cxx
index 20d4598..00940c2 100644
--- a/vcl/source/components/rasterizer_rsvg.cxx
+++ b/vcl/source/components/rasterizer_rsvg.cxx
@@ -54,8 +54,6 @@
     #define VCL_RSVG_LIBRSVG_LIBNAME    "nolibrsvglib"
 #endif
 
-#define VCL_RSVG_DEFAULT_DPI 72
-
 using namespace ::com::sun::star;
 
 // -----------------------------------------------------
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index ee6aa79..6c502be 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -1426,10 +1426,6 @@ void ImplListBoxWindow::KeyInput( const KeyEvent& rKEvt )
 
 // -----------------------------------------------------------------------
 
-#define IMPL_SELECT_NODIRECTION 0
-#define IMPL_SELECT_UP          1
-#define IMPL_SELECT_DOWN        2
-
 sal_Bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
 {
     // zu selektierender Eintrag
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index e2f9e97..46f1169 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -57,12 +57,6 @@
 #include <memcheck.h>
 #endif
 
-// -----------
-// - Defines -
-// -----------
-
-#define SAL_DRAWPIXMAP_MAX_EXT 4096
-
 // -------------
 // - SalBitmap -
 // -------------
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 3e83522..5eafa52 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -1604,8 +1604,6 @@ sal_Bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt
 // -----------------------------------------------------------------------
 
 #define POSTSCRIPT_BUFSIZE 0x4000           // MAXIMUM BUFSIZE EQ 0xFFFF
-#define POSTSCRIPT_BOUNDINGSEARCH 0x1000    // we only try to get the BoundingBox
-                                            // in the first 4096 bytes
 
 static BYTE* ImplSearchEntry( BYTE* pSource, BYTE* pDest, sal_uLong nComp, sal_uLong nSize )
 {


More information about the Libreoffice-commits mailing list