[Libreoffice-commits] .: vcl/aqua vcl/generic vcl/inc vcl/source writerfilter/source xmloff/source
Takeshi Abe
tabe at kemper.freedesktop.org
Wed Jun 13 01:02:34 PDT 2012
vcl/aqua/source/gdi/salgdi.cxx | 6 -----
vcl/generic/fontmanager/fontcache.cxx | 4 ---
vcl/generic/fontmanager/fontmanager.cxx | 13 -----------
vcl/inc/vcl/settings.hxx | 11 ----------
vcl/inc/vcl/vclevent.hxx | 14 ------------
vcl/source/control/ilstbox.cxx | 21 -------------------
vcl/source/gdi/outdev6.cxx | 5 ----
vcl/source/gdi/region.cxx | 4 ---
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 24 ----------------------
xmloff/source/draw/animimp.cxx | 3 --
10 files changed, 105 deletions(-)
New commits:
commit 6c7da3e22a889e559e31f62afb33f9736181a171
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Wed Jun 13 16:42:52 2012 +0900
removed code commented-out in the first place
Change-Id: Idb109cf767342042f1a2941c30fcf137f468e7df
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index e21c30a..933b139 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -355,12 +355,6 @@ AquaSalGraphics::AquaSalGraphics()
AquaSalGraphics::~AquaSalGraphics()
{
-/*
- if( mnUpdateGraphicsEvent )
- {
- Application::RemoveUserEvent( mnUpdateGraphicsEvent );
- }
-*/
CGPathRelease( mxClipPath );
ATSUDisposeStyle( maATSUStyle );
diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx
index be9df03..2c3bc31 100644
--- a/vcl/generic/fontmanager/fontcache.cxx
+++ b/vcl/generic/fontmanager/fontcache.cxx
@@ -59,10 +59,6 @@ using ::rtl::OString;
using ::rtl::OUStringToOString;
/*
- * static helpers
- */
-
-/*
* FontCache constructor
*/
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index ddb2fdb..a53d283 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -481,19 +481,6 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr
aPair.kern_x = (int)nKern * 1000 / pImplTTFont->unitsPerEm;
aPair.kern_y = 0;
m_pMetrics->m_aXKernPairs.push_back( aPair );
-
-/* switch( nCoverage & 1 )
- {
- case 1:
- aPair.kern_x = (int)nKern * 1000 / pImplTTFont->unitsPerEm;
- m_pMetrics->m_aXKernPairs.push_back( aPair );
- break;
- case 0:
- aPair.kern_y = (int)nKern * 1000 / pImplTTFont->unitsPerEm;
- m_pMetrics->m_aYKernPairs.push_back( aPair );
- break;
- }
-*/
}
}
}
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 580bba2..37d8b51 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -1051,17 +1051,6 @@ public:
const LocaleDataWrapper& GetUILocaleDataWrapper() const;
const vcl::I18nHelper& GetLocaleI18nHelper() const;
const vcl::I18nHelper& GetUILocaleI18nHelper() const;
-/*
- const CollatorWrapper& GetCollatorWrapper() const;
- const CollatorWrapper& GetUICollatorWrapper() const;
- sal_Unicode GetMnemonicMatchChar( sal_Unicode c ) const;
- String GetMatchString( const String& rStr ) const;
- String GetUIMatchString( const String& rStr ) const;
- int MatchString( const String& rStr1, xub_StrLen nPos1, xub_StrLen nCount1,
- const String& rStr2, xub_StrLen nPos2, xub_StrLen nCount2 ) const;
- int MatchUIString( const String& rStr1, xub_StrLen nPos1, xub_StrLen nCount1,
- const String& rStr2, xub_StrLen nPos2, xub_StrLen nCount2 ) const;
-*/
void SetSystemUpdate( sal_uLong nUpdate )
{ CopyData(); mpData->mnSystemUpdate = nUpdate; }
diff --git a/vcl/inc/vcl/vclevent.hxx b/vcl/inc/vcl/vclevent.hxx
index 002391b..6829f97 100644
--- a/vcl/inc/vcl/vclevent.hxx
+++ b/vcl/inc/vcl/vclevent.hxx
@@ -222,20 +222,6 @@ public:
void* GetData() const { return pData; }
};
-/*
-class VclMouseEvent : public VclWindowEvent
-{
-private:
- MouseEvent aEvent;
-
-public:
- VclMouseEvent( Window* pWin, sal_uLong n, const MouseEvent& rEvent ) : VclWindowEvent( pWin, n ), aEvent(rEvent) { ; }
- TYPEINFO();
-
- const MouseEvent& GetEvent() const { return aEvent; }
-};
-*/
-
class VCL_DLLPUBLIC VclMenuEvent : public VclSimpleEvent
{
private:
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 6c502be..84c30f2 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2044,18 +2044,6 @@ void ImplListBoxWindow::LoseFocus()
// -----------------------------------------------------------------------
-/*
-void ImplListBoxWindow::RequestHelp( const HelpEvent& rHEvt )
-{
- if ( rHEvt.GetMode() & HELPMODE_BALLOON )
- Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), String() );
-
- Window::RequestHelp( rHEvt );
-}
-*/
-
-// -----------------------------------------------------------------------
-
void ImplListBoxWindow::SetTopEntry( sal_uInt16 nTop )
{
if( mpEntryList->GetEntryCount() == 0 )
@@ -2590,8 +2578,6 @@ void ImplListBox::StateChanged( StateChangedType nType )
{
sal_Bool bUpdate = IsUpdateMode();
maLBWindow.SetUpdateMode( bUpdate );
-// mpHScrollBar->SetUpdateMode( bUpdate );
-// mpVScrollBar->SetUpdateMode( bUpdate );
if ( bUpdate && IsReallyVisible() )
ImplCheckScrollBars();
}
@@ -2634,13 +2620,6 @@ void ImplListBox::StateChanged( StateChangedType nType )
void ImplListBox::DataChanged( const DataChangedEvent& rDCEvt )
{
-// if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
-// (rDCEvt.GetFlags() & SETTINGS_STYLE) )
-// {
-// maLBWindow.SetSettings( GetSettings() );
-// Resize();
-// }
-// else
Control::DataChanged( rDCEvt );
}
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index cb82500..768aba9 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -1042,11 +1042,6 @@ void OutputDevice::ImplDrawGradientWallpaper( long nX, long nY,
const sal_Bool bOldMap = mbMap;
sal_Bool bNeedGradient = sal_True;
-/*
- if ( rWallpaper.IsRect() )
- aBound = LogicToPixel( rWallpaper.GetRect() );
- else
-*/
aBound = Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) );
mpMetaFile = NULL;
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index ee975d0..11eed09 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -2261,10 +2261,6 @@ sal_Bool Region::IsInside( const Point& rPoint ) const
// PolyPolygon data im Imp structure?
((Region*)this)->ImplPolyPolyRegionToBandRegion();
-/*
- if ( mpImplRegion->mpPolyPoly )
- return mpImplRegion->mpPolyPoly->IsInside( rPoint );
-*/
// no instance data? -> not inside
if ( (mpImplRegion == &aImplEmptyRegion) || (mpImplRegion == &aImplNullRegion) )
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 546613a..bda064d 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1887,17 +1887,9 @@ uno::Reference< beans::XPropertySet > DomainMapper_Impl::FindOrCreateFieldMaster
xMaster = uno::Reference< beans::XPropertySet >(
m_xTextFactory->createInstance(sFieldMasterService), uno::UNO_QUERY_THROW);
//set the master's name
-// sal_Int32 nIndex = rtl_str_indexOfStr( pFieldMasterService, "Database" );
-// if( nIndex < 0 )
xMaster->setPropertyValue(
PropertyNameSupplier::GetPropertyNameSupplier().GetName(PROP_NAME),
uno::makeAny(rFieldMasterName));
-// else
-// {
-// xMaster->setPropertyValue(
-// PropertyNameSupplier::GetPropertyNameSupplier().GetName(PROP_DATA_COLUMN_NAME),
-// uno::makeAny(rFieldMasterName));
-// }
}
return xMaster;
}
@@ -3354,22 +3346,6 @@ void DomainMapper_Impl::SetLineNumbering( sal_Int32 nLnnMod, sal_Int32 nLnc, sal
}
catch( const uno::Exception& )
{}
-
-
-
-/*
- { SW_PROP_NAME(UNO_NAME_CHAR_STYLE_NAME
- { SW_PROP_NAME(UNO_NAME_COUNT_EMPTY_LINES
- { SW_PROP_NAME(UNO_NAME_COUNT_LINES_IN_FRAMES
- { SW_PROP_NAME(UNO_NAME_DISTANCE
- { SW_PROP_NAME(UNO_NAME_IS_ON
- { SW_PROP_NAME(UNO_NAME_INTERVAL
- { SW_PROP_NAME(UNO_NAME_SEPARATOR_TEXT
- { SW_PROP_NAME(UNO_NAME_NUMBER_POSITION
- { SW_PROP_NAME(UNO_NAME_NUMBERING_TYPE
- { SW_PROP_NAME(UNO_NAME_RESTART_AT_EACH_PAGE
- { SW_PROP_NAME(UNO_NAME_SEPARATOR_INTERVAL
-*/
}
m_bLineNumberingSet = true;
}
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index 32b44c3..43232c6 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -42,9 +42,6 @@
#include <xmloff/xmlimp.hxx>
#include "xmloff/xmlnmspe.hxx"
#include <xmloff/xmluconv.hxx>
-/*
-#include <xmloff/xmlement.hxx>
-*/
#include <xmloff/nmspmap.hxx>
#include "anim.hxx"
#include "animimp.hxx"
More information about the Libreoffice-commits
mailing list