[Libreoffice-commits] .: 3 commits - svtools/source svx/source
Takeshi Abe
tabe at kemper.freedesktop.org
Fri May 11 06:28:02 PDT 2012
svtools/source/config/apearcfg.cxx | 1
svtools/source/config/miscopt.cxx | 3 -
svtools/source/config/test/test.cxx | 3 -
svtools/source/contnr/imivctl1.cxx | 1
svtools/source/contnr/svimpbox.cxx | 64 ----------------------------
svtools/source/contnr/svlbitm.cxx | 2
svtools/source/contnr/svlbox.cxx | 50 ---------------------
svtools/source/control/ctrlbox.cxx | 3 -
svtools/source/control/roadmap.cxx | 1
svtools/source/control/toolbarmenuimp.hxx | 1
svtools/source/filter/FilterConfigCache.cxx | 5 --
svtools/source/svhtml/parhtml.cxx | 1
svx/source/table/tablecontroller.hxx | 4 -
13 files changed, 139 deletions(-)
New commits:
commit be0c5bd426db05c1dae1b63263e7fac61ec09494
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri May 11 22:22:20 2012 +0900
removed unused defines
Change-Id: Icc2ed1499615728bd8dce1b34e64095fcd5d78b9
diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx
index 0847ad0..0f6c792 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -36,7 +36,6 @@
#include <rtl/logfile.hxx>
#include <sal/macros.h>
-#define DEFAULT_LOOKNFEEL 0
#define DEFAULT_DRAGMODE 2
#define DEFAULT_SNAPMODE 0
#define DEFAULT_SCALEFACTOR 100
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index f43a7c8..51d2ee7 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -51,7 +51,6 @@ using namespace ::com::sun::star;
#define ASCII_STR(s) OUString( RTL_CONSTASCII_USTRINGPARAM(s) )
#define ROOTNODE_MISC ASCII_STR("Office.Common/Misc")
-#define DEFAULT_PLUGINSENABLED sal_True;
#define PROPERTYNAME_PLUGINSENABLED ASCII_STR("PluginsEnabled")
#define PROPERTYHANDLE_PLUGINSENABLED 0
@@ -76,8 +75,6 @@ using namespace ::com::sun::star;
#define PROPERTYNAME_EXPERIMENTALMODE ASCII_STR("ExperimentalMode")
#define PROPERTYHANDLE_EXPERIMENTALMODE 10
-#define PROPERTYCOUNT 11
-
#define VCL_TOOLBOX_STYLE_FLAT ((sal_uInt16)0x0004) // from <vcl/toolbox.hxx>
class SvtMiscOptions_Impl : public ConfigItem
diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx
index bfc48bf..2a63be2 100644
--- a/svtools/source/config/test/test.cxx
+++ b/svtools/source/config/test/test.cxx
@@ -96,9 +96,6 @@ using namespace ::com::sun::star::registry ;
#define ASCII( STEXT ) OUString( RTL_CONSTASCII_USTRINGPARAM( STEXT ))
-#define SERVICENAME_SIMPLEREGISTRY OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry" ))
-#define SERVICENAME_NESTEDREGISTRY OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.NestedRegistry" ))
-
//_________________________________________________________________________________________________________________
// declarations
//_________________________________________________________________________________________________________________
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 7f7eae4..48e8b10 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -46,7 +46,6 @@
#include <algorithm>
#include <memory>
-#define DD_SCROLL_PIXEL 24
#define IMPICNVIEW_ACC_RETURN 1
#define IMPICNVIEW_ACC_ESCAPE 2
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index a4cbfc0..ba1ee4b 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -36,8 +36,6 @@
#include <vcl/sound.hxx>
#include <vcl/salnativewidgets.hxx>
-#define TABOFFS_NOT_VALID -2000000
-
struct SvLBoxButtonData_Impl
{
SvLBoxEntry* pEntry;
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 9c5ddb9..5029aa7 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -62,9 +62,6 @@
#define GAPTOEXTRAPREVIEW 10
#define MAXPREVIEWWIDTH 120
-#define TWIPS_TO_PT100(val) (val * 5)
-#define PT100_TO_TWIPS(val) (val / 5)
-
#define FONTNAMEBOXMRUENTRIESFILE "/user/config/fontnameboxmruentries"
using namespace ::com::sun::star;
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index 60c5853..b2e06dd 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -43,7 +43,6 @@
#define ROADMAP_INDENT_Y 27
#define ROADMAP_ITEM_DISTANCE_Y 6
#define RMINCOMPLETE -1
-#define NADDITEM 1
//.........................................................................
namespace svt
commit 193872bcdfc3f988463a4ff62e25a4f31d81469d
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri May 11 22:21:59 2012 +0900
removed dead code
Change-Id: I76361b6fc995b13547e0bf24a593f91e456502c8
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index fe806c3..9b0baec 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -1656,14 +1656,6 @@ void SvImpLBox::EntrySelected( SvLBoxEntry* pEntry, sal_Bool bSelect )
if( nFlags & F_IGNORE_SELECT )
return;
- /*
- if( (m_nStyle & WB_HIDESELECTION) && pEntry && !pView->HasFocus() )
- {
- SvViewData* pViewData = pView->GetViewData( pEntry );
- pViewData->SetCursored( bSelect );
- }
- */
-
nFlags &= (~F_DESEL_ALL);
if( bSelect &&
aSelEng.GetSelectionMode() == SINGLE_SELECTION &&
@@ -1913,23 +1905,6 @@ void SvImpLBox::EntryInserted( SvLBoxEntry* pEntry )
else if( !pStartEntry )
pView->Invalidate();
- // invalidate the lines
- /*
- if( (bEntryVisible || bPrevEntryVisible) &&
- (m_nStyle & ( WB_HASLINES | WB_HASLINESATROOT )) )
- {
- SvLBoxTab* pTab = pView->GetFirstDynamicTab();
- if( pTab )
- {
- long nDX = pView->GetTabPos( pEntry, pTab );
- Point aTmpPoint;
- Size aSize( nDX, nY );
- Rectangle aRect( aTmpPoint, aSize );
- pView->Invalidate( aRect );
- }
- }
- */
-
SetMostRight( pEntry );
aVerSBar.SetRange( Range(0, pView->GetVisibleCount()-1));
SyncVerThumb(); // if something was inserted before the thumb
@@ -2650,21 +2625,6 @@ void SvImpLBox::GetFocus()
InvalidateEntry( pEntry );
pEntry = pView->NextSelected( pEntry );
}
- /*
- SvLBoxEntry* pEntry = pView->GetModel()->First();
- while( pEntry )
- {
- SvViewData* pViewData = pView->GetViewData( pEntry );
- if( pViewData->IsCursored() )
- {
- pViewData->SetCursored( sal_False );
- InvalidateEntry( pEntry );
- }
- pEntry = pView->GetModel()->Next( pEntry );
- }
- */
-
-
}
}
@@ -2715,12 +2675,6 @@ void ImpLBSelEng::BeginDrag()
pImp->BeginDrag();
}
-/*
-void ImpLBSelEng::EndDrag( const Point& )
-{
-}
-*/
-
void ImpLBSelEng::CreateAnchor()
{
pImp->pAnchor = pImp->pCursor;
@@ -2731,14 +2685,6 @@ void ImpLBSelEng::DestroyAnchor()
pImp->pAnchor = 0;
}
-/*
-void ImpLBSelEng::CreateCursor()
-{
- pImp->pAnchor = 0;
-}
-*/
-
-
sal_Bool ImpLBSelEng::SetCursorAtPoint(const Point& rPoint, sal_Bool bDontSelectAtCursor)
{
SvLBoxEntry* pNewCursor = pImp->MakePointVisible( rPoint );
@@ -2773,16 +2719,6 @@ void ImpLBSelEng::DeselectAtPoint( const Point& rPoint )
pImp->SelectEntry( pEntry, sal_False );
}
-/*
-void ImpLBSelEng::SelectAtPoint( const Point& rPoint )
-{
- SvLBoxEntry* pEntry = pImp->MakePointVisible( rPoint );
- if( !pEntry )
- return;
- pImp->SelectEntry( pEntry, sal_True );
-}
-*/
-
void ImpLBSelEng::DeselectAll()
{
pImp->SelAllDestrAnch( sal_False, sal_False ); // don't reset SelectionEngine!
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index 22a2c95..617428d 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.cxx
@@ -344,31 +344,6 @@ long SvLBoxTab::CalcOffset( long nItemWidth, long nTabWidth )
return nOffset;
}
-/*
-long SvLBoxTab::CalcOffset( const String& rStr, const OutputDevice& rOutDev )
-{
- DBG_CHKTHIS(SvLBoxTab,0);
- long nWidth;
- if ( nFlags & SV_LBOXTAB_ADJUST_NUMERIC )
- {
- sal_uInt16 nPos = rStr.Search( '.' );
- if ( nPos == STRING_NOTFOUND )
- nPos = rStr.Search( ',' );
- if ( nPos == STRING_NOTFOUND )
- nPos = STRING_LEN;
-
- nWidth = rOutDev.GetTextSize( rStr, 0, nPos ).Width();
- nWidth *= -1;
- }
- else
- {
- nWidth = rOutDev.GetTextSize( rStr ).Width();
- nWidth = CalcOffset( nWidth );
- }
- return nWidth;
-}
-*/
-
// ***************************************************************
// class SvLBoxItem
// ***************************************************************
@@ -821,31 +796,6 @@ sal_Bool SvLBox::NotifyCopying(
{
DBG_CHKTHIS(SvLBox,0);
return NotifyMoving(pTarget,pEntry,rpNewParent,rNewChildPos);
- /*
- DBG_ASSERT(pEntry,"NotifyCopying:SourceEntry?");
- if( !pTarget )
- {
- rpNewParent = 0;
- rNewChildPos = 0;
- return sal_True;
- }
- if ( !pTarget->HasChildren() && !pTarget->HasChildrenOnDemand() )
- {
- // Fall 1
- rpNewParent = GetParent( pTarget );
- rNewChildPos = GetRelPos( pTarget ) + 1;
- }
- else
- {
- // Faelle 2 & 3
- rpNewParent = pTarget;
- if( IsExpanded(pTarget))
- rNewChildPos = 0;
- else
- rNewChildPos = LIST_APPEND;
- }
- return sal_True;
- */
}
SvLBoxEntry* SvLBox::CloneEntry( SvLBoxEntry* pSource )
commit 568039f392c33e5fb328cd67774df11fd5734744
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri May 11 22:20:54 2012 +0900
removed unused static data
Change-Id: I76d0aaaee472e1ce114b98c22a7e8e570d5f45c5
diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx
index 9a1cdc1..0b02293 100644
--- a/svtools/source/control/toolbarmenuimp.hxx
+++ b/svtools/source/control/toolbarmenuimp.hxx
@@ -57,7 +57,6 @@ class ToolbarMenuEntry;
typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener > > EventListenerVector;
typedef std::vector< ToolbarMenuEntry * > ToolbarMenuEntryVector;
-const int EXTRAITEMHEIGHT = 0; // 4;
const int SEPARATOR_HEIGHT = 4;
const int TITLE_ID = -1;
const int BORDER_X = 0;
diff --git a/svtools/source/filter/FilterConfigCache.cxx b/svtools/source/filter/FilterConfigCache.cxx
index c7bd37c..7a52d8a 100644
--- a/svtools/source/filter/FilterConfigCache.cxx
+++ b/svtools/source/filter/FilterConfigCache.cxx
@@ -169,13 +169,8 @@ void FilterConfigCache::ImplInit()
{
static OUString STYPE ( RTL_CONSTASCII_USTRINGPARAM( "Type" ) );
static OUString SUINAME ( RTL_CONSTASCII_USTRINGPARAM( "UIName" ) );
- static OUString SDOCUMENTSERVICE ( RTL_CONSTASCII_USTRINGPARAM( "DocumentService" ) );
- static OUString SFILTERSERVICE ( RTL_CONSTASCII_USTRINGPARAM( "FilterService" ) );
- static OUString STEMPLATENAME ( RTL_CONSTASCII_USTRINGPARAM( "TemplateName" ) );
- static OUString SFILEFORMATVERSION ( RTL_CONSTASCII_USTRINGPARAM( "FileFormatVersion" ) );
static OUString SUICOMPONENT ( RTL_CONSTASCII_USTRINGPARAM( "UIComponent" ) );
static OUString SFLAGS ( RTL_CONSTASCII_USTRINGPARAM( "Flags" ) );
- static OUString SUSERDATA ( RTL_CONSTASCII_USTRINGPARAM( "UserData" ) );
static OUString SMEDIATYPE ( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) );
static OUString SEXTENSIONS ( RTL_CONSTASCII_USTRINGPARAM( "Extensions" ) );
static OUString SFORMATNAME ( RTL_CONSTASCII_USTRINGPARAM( "FormatName" ) );
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 781b48a..1c5b350 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -52,7 +52,6 @@ using namespace ::com::sun::star;
const sal_Int32 MAX_LEN( 1024L );
-const sal_Int32 MAX_MACRO_LEN( 1024 );
const sal_Int32 MAX_ENTITY_LEN( 8L );
diff --git a/svx/source/table/tablecontroller.hxx b/svx/source/table/tablecontroller.hxx
index ed64dce..ea06f17 100644
--- a/svx/source/table/tablecontroller.hxx
+++ b/svx/source/table/tablecontroller.hxx
@@ -45,10 +45,6 @@ class SfxItemSet;
namespace sdr { namespace table {
-const sal_Int16 SELTYPE_NONE = 0;
-const sal_Int16 SELTYPE_MOUSE = 1;
-const sal_Int16 SELTYPE_KEYS = 2;
-
class SVX_DLLPUBLIC SvxTableController: public sdr::SelectionController
{
public:
More information about the Libreoffice-commits
mailing list