[Libreoffice-commits] .: uui/source vcl/source
Takeshi Abe
tabe at kemper.freedesktop.org
Mon May 7 06:16:23 PDT 2012
uui/source/iahndl-ssl.cxx | 1 -
vcl/source/app/settings.cxx | 7 -------
vcl/source/control/menubtn.cxx | 7 -------
vcl/source/gdi/bitmap2.cxx | 2 --
vcl/source/gdi/graph.cxx | 11 -----------
vcl/source/gdi/image.cxx | 2 --
vcl/source/gdi/impimage.cxx | 1 -
vcl/source/gdi/metaact.cxx | 1 -
vcl/source/gdi/outdev2.cxx | 4 ----
vcl/source/gdi/salmisc.cxx | 3 ---
vcl/source/window/wrkwin.cxx | 5 -----
11 files changed, 44 deletions(-)
New commits:
commit 3312d3462318d39b90d3a30e09df08ccb20d51cc
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Mon May 7 22:11:27 2012 +0900
removed unused defines
Change-Id: Ieaba4fe704cc588bd515b427a7f14008afea8c03
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index 2b860ff..53812e2 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -52,7 +52,6 @@
#include <boost/scoped_ptr.hpp>
#define DESCRIPTION_1 1
-#define DESCRIPTION_2 2
#define TITLE 3
#define OID_SUBJECT_ALTERNATIVE_NAME "2.5.29.17"
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 939a751..cd2c7e6 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -56,13 +56,6 @@ DBG_NAME( AllSettings )
// =======================================================================
-#define STDSYS_STYLE (STYLE_OPTION_SCROLLARROW | \
- STYLE_OPTION_SPINARROW | \
- STYLE_OPTION_SPINUPDOWN | \
- STYLE_OPTION_NOMNEMONICS)
-
-// =======================================================================
-
ImplMouseData::ImplMouseData()
{
mnRefCount = 1;
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 2bb1412..5715367 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -35,13 +35,6 @@
#include <vcl/menubtn.hxx>
#include <vcl/svapp.hxx>
-
-
-// =======================================================================
-
-#define IMAGEBUTTON_BORDER_OFF1 11
-#define IMAGEBUTTON_BORDER_OFF2 16
-
// =======================================================================
void MenuButton::ImplInitMenuButtonData()
diff --git a/vcl/source/gdi/bitmap2.cxx b/vcl/source/gdi/bitmap2.cxx
index c559383..dc05ba9 100644
--- a/vcl/source/gdi/bitmap2.cxx
+++ b/vcl/source/gdi/bitmap2.cxx
@@ -49,8 +49,6 @@
#define DIBINFOHEADERSIZE ( sizeof( DIBInfoHeader ) )
#define BITMAPINFOHEADER 0x28
-#define SETPIXEL4( pBuf, nX, cChar )( (pBuf)[ (nX) >> 1 ] |= ( (nX) & 1 ) ? ( cChar ): (cChar) << 4 );
-
// ----------------------
// - Compression defines
// ----------------------
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 4f02074..35ac193 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -43,17 +43,6 @@
#include <cppuhelper/typeprovider.hxx>
#include <rtl/instance.hxx>
-// -----------------------
-// - Compression defines -
-// -----------------------
-
-#define COMPRESS_OWN ('S'|('D'<<8UL))
-#define COMPRESS_NONE ( 0UL )
-#define RLE_8 ( 1UL )
-#define RLE_4 ( 2UL )
-#define BITFIELDS ( 3UL )
-#define ZCOMPRESS ( COMPRESS_OWN | 0x01000000UL ) /* == 'SD01' (binary) */
-
using namespace ::com::sun::star;
// -----------------------
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index c922982..f0b8744 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -52,8 +52,6 @@
DBG_NAME( Image )
DBG_NAME( ImageList )
-#define IMAGE_FILE_VERSION 100
-
using namespace ::com::sun::star;
// ---------
diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx
index 4e7ebed..99fcfb2 100644
--- a/vcl/source/gdi/impimage.cxx
+++ b/vcl/source/gdi/impimage.cxx
@@ -43,7 +43,6 @@
#define IMPSYSIMAGEITEM_MASK ( 0x01 )
#define IMPSYSIMAGEITEM_ALPHA ( 0x02 )
-#define DISA_ALL ( 0xffff )
// -----------------------------------------------------------------------
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 0572394..1a25a12 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -85,7 +85,6 @@ inline void ImplScaleLineInfo( LineInfo& rLineInfo, double fScaleX, double fScal
// ========================================================================
#define COMPAT( _def_rIStm ) VersionCompat aCompat( ( _def_rIStm ), STREAM_READ );
-#define COMPAT_VERSION() aCompat.GetVersion()
#define WRITE_BASE_COMPAT( _def_rOStm, _def_nVer, _pWriteData ) \
MetaAction::Write( ( _def_rOStm ), _pWriteData ); \
VersionCompat aCompat( ( _def_rOStm ), STREAM_WRITE, ( _def_nVer ) );
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index d0f727e..45cc6a2 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -50,10 +50,6 @@
#include <region.h>
#include <outdata.hxx>
-#define BAND_MAX_SIZE 512000
-
-// =======================================================================
-
DBG_NAMEEX( OutputDevice )
// =======================================================================
diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx
index cae618d..4f13fbb 100644
--- a/vcl/source/gdi/salmisc.cxx
+++ b/vcl/source/gdi/salmisc.cxx
@@ -82,9 +82,6 @@ static long ImplIndexFromColor( const BitmapColor& rCol )
#endif
}
-
-#define COLOR_TO_INDEX( _def_rCol )
-
// ------------------------
// - conversion functions -
// ------------------------
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 822f979..6438145 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -45,11 +45,6 @@
// =======================================================================
-#define WORKWIN_WINDOWSTATE_FULLSCREEN ((sal_uLong)0x00010000)
-#define WORKWIN_WINDOWSTATE_ALL ((sal_uLong)0x00FF0000)
-
-// =======================================================================
-
void WorkWindow::ImplInitWorkWindowData()
{
mnIcon = 0; // Should be removed in the next top level update - now in SystemWindow
More information about the Libreoffice-commits
mailing list