[Libreoffice-commits] core.git: 2 commits - avmedia/inc avmedia/source cui/source extensions/source filter/source sd/source svtools/inc svtools/source svx/inc svx/source vcl/inc vcl/source
Tor Lillqvist
tml at iki.fi
Sat Mar 16 13:54:05 PDT 2013
avmedia/inc/avmedia/mediaplayer.hxx | 12
avmedia/inc/avmedia/mediawindow.hxx | 14 -
avmedia/source/quicktime/window.mm | 62 ----
avmedia/source/win/window.cxx | 86 ------
cui/source/inc/cuigaldlg.hxx | 47 ---
extensions/source/scanner/scanner.hxx | 10
extensions/source/scanner/scanwin.cxx | 98 -------
filter/source/config/tools/merge/pyAltFCFGMerge | 55 ++--
filter/source/svg/svgfilter.hxx | 49 ---
filter/source/svg/svgwriter.cxx | 135 ----------
sd/source/filter/cgm/sdcgmfilter.cxx | 23 -
sd/source/ui/app/sdxfer.cxx | 45 ---
sd/source/ui/dlg/vectdlg.cxx | 34 --
sd/source/ui/inc/optsitem.hxx | 62 ----
sd/source/ui/inc/res_bmp.hrc | 9
sd/source/ui/slideshow/showwindow.hxx | 13
svtools/inc/svtools/grfmgr.hxx | 32 --
svtools/inc/svtools/transfer.hxx | 41 ---
svtools/source/config/printoptions.cxx | 99 -------
svtools/source/control/valueimp.hxx | 20 -
svtools/source/graphic/grfcache.cxx | 92 ------
svx/inc/gallery.hrc | 4
svx/inc/galobj.hxx | 33 --
svx/inc/svx/galbrws.hxx | 17 -
svx/inc/svx/galctrl.hxx | 16 -
svx/inc/svx/gallery.hxx | 8
svx/inc/svx/galmisc.hxx | 39 --
svx/inc/svx/svdograf.hxx | 16 -
svx/inc/svx/xoutbmp.hxx | 12
svx/source/gallery2/galbrws2.cxx | 96 -------
svx/source/gallery2/galctrl.cxx | 91 ------
svx/source/svdraw/svdograf.cxx | 126 ---------
svx/source/tbxctrls/grafctrl.cxx | 143 ----------
svx/source/xml/xmleohlp.cxx | 37 --
svx/source/xml/xmlgrhlp.cxx | 79 -----
svx/source/xoutdev/_xoutbmp.cxx | 24 -
vcl/inc/vcl/bitmap.hxx | 59 ----
vcl/inc/vcl/cvtsvm.hxx | 8
vcl/inc/vcl/gdimtf.hxx | 13
vcl/inc/vcl/image.hxx | 16 -
vcl/inc/vcl/metaact.hxx | 226 ----------------
vcl/inc/vcl/octree.hxx | 22 -
vcl/inc/vcl/salctype.hxx | 16 -
vcl/inc/win/salgdi.h | 16 -
vcl/source/filter/graphicfilter.cxx | 116 --------
vcl/source/filter/igif/gifread.cxx | 38 --
vcl/source/filter/igif/gifread.hxx | 16 -
vcl/source/filter/ixbm/xbmread.hxx | 12
vcl/source/filter/ixpm/xpmread.hxx | 12
vcl/source/filter/jpeg/jpeg.cxx | 41 ---
vcl/source/filter/jpeg/jpeg.hxx | 16 -
vcl/source/filter/wmf/emfwr.cxx | 53 ---
vcl/source/gdi/animate.cxx | 67 ----
vcl/source/gdi/bitmap.cxx | 85 ------
vcl/source/gdi/bitmap2.cxx | 46 ---
vcl/source/gdi/bitmap3.cxx | 16 -
vcl/source/gdi/bitmap4.cxx | 28 --
vcl/source/gdi/gdimtf.cxx | 134 ---------
vcl/source/gdi/impgraph.cxx | 131 ---------
vcl/source/gdi/impimage.cxx | 46 ---
vcl/source/gdi/impvect.cxx | 97 -------
vcl/source/gdi/outdev.cxx | 119 --------
vcl/source/gdi/outdev2.cxx | 16 -
vcl/source/gdi/outdev3.cxx | 324 ------------------------
vcl/source/gdi/outdev4.cxx | 36 --
vcl/source/gdi/pngread.cxx | 70 -----
vcl/source/gdi/pngwrite.cxx | 43 ---
vcl/source/gdi/print2.cxx | 17 -
vcl/source/gdi/salmisc.cxx | 28 --
vcl/source/window/scrwnd.cxx | 32 --
vcl/source/window/scrwnd.hxx | 8
71 files changed, 38 insertions(+), 3764 deletions(-)
New commits:
commit abdba4ac6ed62f4a3430b9ba381129bbd667a5f7
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat Mar 16 22:51:02 2013 +0200
Fix Python problem in pyAltFCFGMerge at least on OS X
AttributeError: 'NoneType' object has no attribute 'write' when trying
to print to stdout and sys.stdout has been set to None.
Change-Id: Icb571b9e910d4ec393dc1fd246f867c02d5ac8e5
diff --git a/filter/source/config/tools/merge/pyAltFCFGMerge b/filter/source/config/tools/merge/pyAltFCFGMerge
index 1baecf6..a158273 100755
--- a/filter/source/config/tools/merge/pyAltFCFGMerge
+++ b/filter/source/config/tools/merge/pyAltFCFGMerge
@@ -278,7 +278,7 @@ def readprops(buff):
def run(sCmdLine):
aCfg = ConfigHelper(CFGFILE, sCmdLine)
if aCfg.getValueWithDefault(PROP_VERBOSE,None) == None:
- sys.stdout=None
+ sys.stdout=None
printCopyright()
@@ -293,23 +293,28 @@ def run(sCmdLine):
sys.exit(0)
+def printOut(s):
+ if sys.stdout is None:
+ return
+ print(s)
+
#prints out a copyright message on stdout.
def printCopyright():
- print("FCFGMerge")
- print("Copyright: 2003 by Red Hat, Inc., based on FCFGMerge.java` by Sun")
- print("All Rights Reserved.")
+ printOut("FCFGMerge")
+ printOut("Copyright: 2003 by Red Hat, Inc., based on FCFGMerge.java` by Sun")
+ printOut("All Rights Reserved.")
# Prints out a help message on stdout.
def printHelp():
- print("____________________________________________________________")
- print("usage: FCFGMerge cfg=<file name>" )
- print("parameters:" )
- print("\tcfg=<file name>" )
- print("\t\tmust point to a system file, which contains" )
- print("\t\tall neccessary configuration data for the merge process.")
- print("\tFurther cou can specify every parameter allowed in the" )
- print("\tconfig file as command line parameter too, to overwrite" )
- print("\tthe value from the file." )
+ printOut("____________________________________________________________")
+ printOut("usage: FCFGMerge cfg=<file name>" )
+ printOut("parameters:" )
+ printOut("\tcfg=<file name>" )
+ printOut("\t\tmust point to a system file, which contains" )
+ printOut("\t\tall neccessary configuration data for the merge process.")
+ printOut("\tFurther cou can specify every parameter allowed in the" )
+ printOut("\tconfig file as command line parameter too, to overwrite" )
+ printOut("\tthe value from the file." )
# Return a list of tokens given a base string and a string of
# separators, optionally including the separators if asked for"""
@@ -352,7 +357,7 @@ class ConfigHelper:
count = len(lCommandLineArgs)
self.m_bEmpty = (count < 1)
- # print(lCommandLineArgs, "and len is", count)
+ # printOut(lCommandLineArgs, "and len is", count)
for arg in range(count):
# is it a named-value argument?
# Note: We ignores double "=" signs! => search from left to right
@@ -478,8 +483,8 @@ class Merger:
def merge(self):
sPackage = self.m_aCfg.getValue(PROP_PKG)
- print("create package \"" + sPackage + "\" ...")
- print("generate package header ... ")
+ printOut("create package \"" + sPackage + "\" ...")
+ printOut("generate package header ... ")
sBuffer = generateHeader(\
self.m_aCfg.getValue(PROP_XMLVERSION ),\
@@ -500,22 +505,22 @@ class Merger:
try:
if i == 0: # types
- print("generate set for types ... ")
+ printOut("generate set for types ... ")
sSetName = self.m_aCfg.getValue(PROP_SETNAME_TYPES)
sSubDir = self.m_aCfg.getValue(PROP_SUBDIR_TYPES)
lFragments = self.m_lTypes
elif i == 1: # filters
- print("generate set for filter ... ")
+ printOut("generate set for filter ... ")
sSetName = self.m_aCfg.getValue(PROP_SETNAME_FILTERS)
sSubDir = self.m_aCfg.getValue(PROP_SUBDIR_FILTERS)
lFragments = self.m_lFilters
elif i == 2: # loaders
- print("generate set for frame loader ... ")
+ printOut("generate set for frame loader ... ")
sSetName = self.m_aCfg.getValue(PROP_SETNAME_LOADERS)
sSubDir = self.m_aCfg.getValue(PROP_SUBDIR_LOADERS)
lFragments = self.m_lLoaders
elif i == 3: # handlers
- print("generate set for content handler ... ")
+ printOut("generate set for content handler ... ")
sSetName = self.m_aCfg.getValue(PROP_SETNAME_HANDLERS)
sSubDir = self.m_aCfg.getValue(PROP_SUBDIR_HANDLERS)
lFragments = self.m_lHandlers
@@ -528,7 +533,7 @@ class Merger:
os.path.join(self.m_aFragmentsDir, sSubDir), \
sSetName, lFragments, 1)
- print("generate package footer ... ")
+ printOut("generate package footer ... ")
sBuffer = sBuffer + generateFooter()
# Attention!
@@ -536,13 +541,13 @@ class Merger:
# corresponding xml file. We should suppress writing of this file on
# disk completly ...
if nItemCount < 1:
- print("Package is empty and will not result into a xml file on "\
+ printOut("Package is empty and will not result into a xml file on "\
"disk!? Please check configuration file.")
return
- print("package contains " + str(nItemCount) + " items")
+ printOut("package contains " + str(nItemCount) + " items")
aPackage = codecs.open(sPackage, 'w', "utf-8")
- print("write temp package \"" + sPackage)
+ printOut("write temp package \"" + sPackage)
aPackage.write(sBuffer)
# Reads the fragment files with the file names lFragments in directory aDir,
@@ -566,7 +571,7 @@ class Merger:
except:
# handle simple files only and check for existence!
raise Exception("fragment \"" + sFragPath + "\" does not exists.")
- print("merge fragment \"" + sFragPath + "\" ...")
+ printOut("merge fragment \"" + sFragPath + "\" ...")
sBuffer = sBuffer + aFragmentFile.read()
sBuffer = sBuffer + "\n"
commit 2976b53ff8c815f5f6a5deba1763fba153bd528f
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat Mar 16 22:33:14 2013 +0200
Bin more pointless comments and ASCII graphics
Suggested Easy Hack: Replace all instances of // -------- comments
including surrounding newlines with a single newline.
Another Easy Hack, slightly harder to automate: Remove all the
pointless comments that just tell the class name right before the
declaration of that class.
Change-Id: Ia890ed613b53c5d719988697e20a983d62334123
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx
index 9db1188..b823f7c 100644
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -24,10 +24,6 @@
#include <sfx2/dockwin.hxx>
#include <avmedia/avmediadllapi.h>
-// -----------
-// - Defines -
-// -----------
-
#define AVMEDIA_MEDIAWINDOW() \
(static_cast< ::avmedia::MediaFloater* >( ( \
SfxViewFrame::Current() && SfxViewFrame::Current()->GetChildWindow(::avmedia::MediaPlayer::GetChildWindowId())) ? \
@@ -37,10 +33,6 @@ NULL))
namespace avmedia
{
-// ---------------
-// - MediaPlayer -
-// ---------------
-
class AVMEDIA_DLLPUBLIC MediaPlayer : public SfxChildWindow
{
public:
@@ -50,10 +42,6 @@ public:
SFX_DECL_CHILDWINDOW_WITHID( MediaPlayer );
};
-// ----------------
-// - MediaFloater -
-// ----------------
-
class MediaWindow;
class AVMEDIA_DLLPUBLIC MediaFloater : public SfxDockingWindow
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx
index 89fb9ff..bafb765 100644
--- a/avmedia/inc/avmedia/mediawindow.hxx
+++ b/avmedia/inc/avmedia/mediawindow.hxx
@@ -29,16 +29,8 @@
#include <com/sun/star/uno/XInterface.hpp>
#include <avmedia/avmediadllapi.h>
-// -----------
-// - Defines -
-// -----------
-
#define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME -1.0
-// ------------------------
-// - Forward Declarations -
-// ------------------------
-
class Window;
class KeyEvent;
class MouseEvent;
@@ -50,8 +42,6 @@ struct ExecuteDropEvent;
namespace rtl { class OUString; }
-/* Declaration of MediaWindow class */
-
namespace avmedia
{
typedef ::std::vector< ::std::pair< OUString, OUString > > FilterNameVector;
@@ -60,10 +50,6 @@ namespace avmedia
namespace priv { class MediaWindowImpl; }
- // ---------------
- // - MediaWindow -
- // ---------------
-
class AVMEDIA_DLLPUBLIC MediaWindow
{
public:
diff --git a/avmedia/source/quicktime/window.mm b/avmedia/source/quicktime/window.mm
index bdb4e08..0950ead 100644
--- a/avmedia/source/quicktime/window.mm
+++ b/avmedia/source/quicktime/window.mm
@@ -27,10 +27,6 @@ using namespace ::com::sun::star;
namespace avmedia { namespace quicktime {
-// -----------
-// - statics -
-// -----------
-
static ::osl::Mutex& ImplGetOwnStaticMutex()
{
static ::osl::Mutex* pMutex = NULL;
@@ -49,12 +45,6 @@ static ::osl::Mutex& ImplGetOwnStaticMutex()
return *pMutex;
}
-// ---------------
-// - Window -
-// ---------------
-
-// ------------------------------------------------------------------------------
-
Window::Window( const uno::Reference< lang::XMultiServiceFactory >& i_rxMgr, Player& i_rPlayer, NSView* i_pParentView ) :
mxMgr( i_rxMgr ),
maListeners( maMutex ),
@@ -84,8 +74,6 @@ Window::Window( const uno::Reference< lang::XMultiServiceFactory >& i_rxMgr, Pla
OSL_TRACE ("Window::Window");
}
-// ------------------------------------------------------------------------------
-
Window::~Window()
{
if( mpMovieView )
@@ -103,7 +91,6 @@ bool Window::create( const ::com::sun::star::uno::Sequence< ::com::sun::star::un
}
// XPlayerWindow
-// ------------------------------------------------------------------------------
void SAL_CALL Window::update( )
throw (uno::RuntimeException)
@@ -111,24 +98,18 @@ void SAL_CALL Window::update( )
;
}
-// ------------------------------------------------------------------------------
-
sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel )
throw (uno::RuntimeException)
{
return false;
}
-// ------------------------------------------------------------------------------
-
media::ZoomLevel SAL_CALL Window::getZoomLevel( )
throw (uno::RuntimeException)
{
return meZoomLevel;
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
throw (uno::RuntimeException)
{
@@ -136,7 +117,6 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
}
// XWindow
-// ------------------------------------------------------------------------------
void SAL_CALL Window::setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
throw (uno::RuntimeException)
@@ -151,8 +131,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_I
}
}
-// ------------------------------------------------------------------------------
-
awt::Rectangle SAL_CALL Window::getPosSize()
throw (uno::RuntimeException)
{
@@ -166,8 +144,6 @@ awt::Rectangle SAL_CALL Window::getPosSize()
return aRet;
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::setVisible( sal_Bool )
throw (uno::RuntimeException)
{
@@ -175,112 +151,84 @@ void SAL_CALL Window::setVisible( sal_Bool )
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::setEnable( sal_Bool )
throw (uno::RuntimeException)
{
;
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::setFocus( )
throw (uno::RuntimeException)
{
OSL_TRACE ("Window::setFocus");
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
throw (uno::RuntimeException)
{
@@ -288,23 +236,18 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList
}
// XComponent
-// ------------------------------------------------------------------------------
void SAL_CALL Window::dispose( )
throw (uno::RuntimeException)
{
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw (uno::RuntimeException)
{
@@ -312,7 +255,6 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
}
// XServiceInfo
-// ------------------------------------------------------------------------------
::rtl::OUString SAL_CALL Window::getImplementationName( )
throw (uno::RuntimeException)
@@ -320,16 +262,12 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
return ::rtl::OUString( AVMEDIA_QUICKTIME_WINDOW_IMPLEMENTATIONNAME );
}
-// ------------------------------------------------------------------------------
-
sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
{
return ( ServiceName == AVMEDIA_QUICKTIME_WINDOW_SERVICENAME );
}
-// ------------------------------------------------------------------------------
-
uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index 70757e7..0956cc1 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -41,10 +41,6 @@ using namespace ::com::sun::star;
namespace avmedia { namespace win {
-// -----------
-// - statics -
-// -----------
-
static ::osl::Mutex& ImplGetOwnStaticMutex()
{
static ::osl::Mutex* pMutex = NULL;
@@ -63,10 +59,6 @@ static ::osl::Mutex& ImplGetOwnStaticMutex()
return *pMutex;
}
-// -----------
-// - WndProc -
-// -----------
-
LRESULT CALLBACK MediaPlayerWndProc( HWND hWnd,UINT nMsg, WPARAM nPar1, LPARAM nPar2 )
{
Window* pWindow = (Window*) ::GetWindowLong( hWnd, 0 );
@@ -165,10 +157,6 @@ LRESULT CALLBACK MediaPlayerWndProc( HWND hWnd,UINT nMsg, WPARAM nPar1, LPARAM n
return( bProcessed ? 0 : DefWindowProc( hWnd, nMsg, nPar1, nPar2 ) );
}
-// ---------------
-// - Window -
-// ---------------
-
WNDCLASS* lcl_getWndClass()
{
static WNDCLASS* s_pWndClass = NULL;
@@ -189,8 +177,6 @@ WNDCLASS* lcl_getWndClass()
return s_pWndClass;
}
-// ------------------------------------------------------------------------------
-
Window::Window( const uno::Reference< lang::XMultiServiceFactory >& rxMgr, Player& rPlayer ) :
mxMgr( rxMgr ),
mrPlayer( rPlayer ),
@@ -205,16 +191,12 @@ Window::Window( const uno::Reference< lang::XMultiServiceFactory >& rxMgr, Playe
lcl_getWndClass();
}
-// ------------------------------------------------------------------------------
-
Window::~Window()
{
if( mnFrameWnd )
::DestroyWindow( (HWND) mnFrameWnd );
}
-// ------------------------------------------------------------------------------
-
void Window::ImplLayoutVideoWindow()
{
if( media::ZoomLevel_NOT_AVAILABLE != meZoomLevel )
@@ -300,8 +282,6 @@ void Window::ImplLayoutVideoWindow()
}
}
-// ------------------------------------------------------------------------------
-
bool Window::create( const uno::Sequence< uno::Any >& rArguments )
{
IVideoWindow* pVideoWindow = const_cast< IVideoWindow* >( mrPlayer.getVideoWindow() );
@@ -351,15 +331,11 @@ bool Window::create( const uno::Sequence< uno::Any >& rArguments )
return( mnFrameWnd != 0 );
}
-// ------------------------------------------------------------------------------
-
void Window::processGraphEvent()
{
mrPlayer.processEvent();
}
-// ------------------------------------------------------------------------------
-
void Window::updatePointer()
{
char* pCursorName;
@@ -378,16 +354,12 @@ void Window::updatePointer()
::SetCursor( ::LoadCursor( NULL, pCursorName ) );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::update( )
throw (uno::RuntimeException)
{
::RedrawWindow( (HWND) mnFrameWnd, NULL, NULL, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_UPDATENOW | RDW_ERASE );
}
-// ------------------------------------------------------------------------------
-
sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
throw (uno::RuntimeException)
{
@@ -408,24 +380,18 @@ sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
return bRet;
}
-// ------------------------------------------------------------------------------
-
media::ZoomLevel SAL_CALL Window::getZoomLevel( )
throw (uno::RuntimeException)
{
return meZoomLevel;
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
throw (uno::RuntimeException)
{
mnPointerType = nPointerType;
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 )
throw (uno::RuntimeException)
{
@@ -436,8 +402,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal
}
}
-// ------------------------------------------------------------------------------
-
awt::Rectangle SAL_CALL Window::getPosSize()
throw (uno::RuntimeException)
{
@@ -459,8 +423,6 @@ awt::Rectangle SAL_CALL Window::getPosSize()
return aRet;
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::setVisible( sal_Bool bVisible )
throw (uno::RuntimeException)
{
@@ -475,8 +437,6 @@ void SAL_CALL Window::setVisible( sal_Bool bVisible )
}
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::setEnable( sal_Bool bEnable )
throw (uno::RuntimeException)
{
@@ -484,8 +444,6 @@ void SAL_CALL Window::setEnable( sal_Bool bEnable )
::EnableWindow( (HWND) mnFrameWnd, bEnable );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::setFocus( )
throw (uno::RuntimeException)
{
@@ -493,127 +451,95 @@ void SAL_CALL Window::setFocus( )
::SetFocus( (HWND) mnFrameWnd );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::dispose( )
throw (uno::RuntimeException)
{
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void Window::fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
{
::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseListener >*) 0 ) );
@@ -627,8 +553,6 @@ void Window::fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEv
}
}
-// -----------------------------------------------------------------------------
-
void Window::fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
{
::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseListener >*) 0 ) );
@@ -642,8 +566,6 @@ void Window::fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rE
}
}
-// -----------------------------------------------------------------------------
-
void Window::fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
{
::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseMotionListener >*) 0 ) );
@@ -657,8 +579,6 @@ void Window::fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt
}
}
-// -----------------------------------------------------------------------------
-
void Window::fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt )
{
::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XFocusListener >*) 0 ) );
@@ -672,24 +592,18 @@ void Window::fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt )
}
}
-// ------------------------------------------------------------------------------
-
OUString SAL_CALL Window::getImplementationName( )
throw (uno::RuntimeException)
{
return OUString( AVMEDIA_WIN_WINDOW_IMPLEMENTATIONNAME );
}
-// ------------------------------------------------------------------------------
-
sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return ServiceName == AVMEDIA_WIN_WINDOW_SERVICENAME;
}
-// ------------------------------------------------------------------------------
-
uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 537060b..3f7c989 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -42,10 +42,6 @@
#include <svtools/dialogclosedlistener.hxx>
#include <vector>
-// ------------
-// - Forwards -
-// ------------
-
class GalleryTheme;
class SearchProgress;
class TakeProgress;
@@ -54,19 +50,11 @@ class TPGalleryThemeProperties;
typedef ::std::vector< OUString > StringList;
typedef ::std::vector< sal_uLong > TokenList_impl;
-// ---------------
-// - FilterEntry -
-// ---------------
-
struct FilterEntry
{
String aFilterName;
};
-// ----------------
-// - SearchThread -
-// ----------------
-
class SearchThread: public salhelper::Thread
{
private:
@@ -89,10 +77,6 @@ public:
const INetURLObject& rStartURL );
};
-// ------------------
-// - SearchProgress -
-// ------------------
-
class SearchProgress : public ModalDialog
{
private:
@@ -121,10 +105,6 @@ public:
void SetDirectory( const INetURLObject& rURL ) { aFtSearchDir.SetText( GetReducedString( rURL, 30 ) ); }
};
-// --------------
-// - TakeThread -
-// --------------
-
class TakeThread: public salhelper::Thread
{
private:
@@ -145,10 +125,6 @@ public:
);
};
-// ----------------
-// - TakeProgress -
-// ----------------
-
class TakeProgress : public ModalDialog
{
private:
@@ -175,10 +151,6 @@ public:
virtual void StartExecuteModal( const Link& rEndDialogHdl );
};
-// ---------------------
-// - ActualizeProgress -
-// ---------------------
-
class ActualizeProgress : public ModalDialog
{
private:
@@ -201,10 +173,6 @@ public:
virtual short Execute();
};
-// ---------------
-// - TitleDialog -
-// ---------------
-
class TitleDialog : public ModalDialog
{
private:
@@ -221,10 +189,6 @@ public:
String GetTitle() const { return maEdit.GetText(); }
};
-// -------------------
-// - GalleryIdDialog -
-// -------------------
-
class GalleryIdDialog : public ModalDialog
{
private:
@@ -246,10 +210,6 @@ public:
sal_uLong GetId() const { return aLbResName.GetSelectEntryPos(); }
};
-// --------------------------
-// - GalleryThemeProperties -
-// --------------------------
-
class GalleryThemeProperties : public SfxTabDialog
{
ExchangeData* pData;
@@ -262,10 +222,6 @@ public:
~GalleryThemeProperties() {}
};
-// -------------------------
-// - TPGalleryThemeGeneral -
-// -------------------------
-
class TPGalleryThemeGeneral : public SfxTabPage
{
private:
@@ -299,9 +255,6 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
};
-// ----------------------------
-// - TPGalleryThemeProperties -
-// ----------------------------
typedef ::std::vector< FilterEntry* > FilterEntryList_impl;
class TPGalleryThemeProperties : public SfxTabPage
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index 68cedca..2cf7664 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -39,19 +39,11 @@ using namespace com::sun::star::scanner;
using ::rtl::OUString;
-// -----------
-// - Defines -
-// -----------
-
#define REF( _def_Obj ) Reference< _def_Obj >
#define SEQ( _def_Obj ) Sequence< _def_Obj >
#define ANY Any
#define AWT com::sun::star::awt
-// ------------------
-// - ScannerManager -
-// ------------------
-
class ScannerManager : public OWeakObject, XScannerManager2, AWT::XBitmap
{
protected:
@@ -96,8 +88,6 @@ public:
void SetData( void* pData ) { ReleaseData(); mpData = pData; }
};
-// -----------------------------------------------------------------------------
-
REF( XInterface ) SAL_CALL ScannerManager_CreateInstance( const REF( com::sun::star::lang::XMultiServiceFactory )& rxFactory ) throw( Exception );
#endif
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 020ad5a..e52b688 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -52,10 +52,6 @@
using namespace ::com::sun::star;
-// -----------
-// - Defines -
-// -----------
-
#define TWAIN_SELECT 0x00000001UL
#define TWAIN_ACQUIRE 0x00000002UL
#define TWAIN_TERMINATE 0xFFFFFFFFUL
@@ -75,10 +71,6 @@ using namespace ::com::sun::star;
#define TWAIN_FUNCNAME "DSM_Entry"
#endif
-// --------------
-// - TwainState -
-// --------------
-
enum TwainState
{
TWAIN_STATE_NONE = 0,
@@ -87,10 +79,6 @@ enum TwainState
TWAIN_STATE_CANCELED = 3
};
-// ------------
-// - ImpTwain -
-// ------------
-
class ImpTwain : public ::cppu::WeakImplHelper1< util::XCloseListener >
{
friend LRESULT CALLBACK TwainMsgProc( int nCode, WPARAM wParam, LPARAM lParam );
@@ -142,21 +130,13 @@ public:
bool InitXfer();
};
-// ---------
-// - Procs -
-// ---------
-
static ImpTwain* pImpTwainInstance = NULL;
-// -------------------------------------------------------------------------
-
LRESULT CALLBACK TwainWndProc( HWND hWnd,UINT nMsg, WPARAM nPar1, LPARAM nPar2 )
{
return DefWindowProc( hWnd, nMsg, nPar1, nPar2 );
}
-// -------------------------------------------------------------------------
-
LRESULT CALLBACK TwainMsgProc( int nCode, WPARAM wParam, LPARAM lParam )
{
MSG* pMsg = (MSG*) lParam;
@@ -174,8 +154,6 @@ LRESULT CALLBACK TwainMsgProc( int nCode, WPARAM wParam, LPARAM lParam )
}
}
-// -----------------------------------------------------------------------------
-
// #107835# hold reference to ScannerManager, to prevent premature death
ImpTwain::ImpTwain( ScannerManager& rMgr, const Link& rNotifyLink ) :
mxMgr( uno::Reference< scanner::XScannerManager >( static_cast< OWeakObject* >( &rMgr ), uno::UNO_QUERY) ),
@@ -218,8 +196,6 @@ ImpTwain::ImpTwain( ScannerManager& rMgr, const Link& rNotifyLink ) :
mxSelfRef = static_cast< ::cppu::OWeakObject* >( this );
}
-// -----------------------------------------------------------------------------
-
ImpTwain::~ImpTwain()
{
// are we responsible for application shutdown?
@@ -227,16 +203,12 @@ ImpTwain::~ImpTwain()
ImplSendCloseEvent();
}
-// -----------------------------------------------------------------------------
-
void ImpTwain::Destroy()
{
ImplFallback( TWAIN_EVENT_NONE );
Application::PostUserEvent( LINK( this, ImpTwain, ImplDestroyHdl ), NULL );
}
-// -----------------------------------------------------------------------------
-
bool ImpTwain::SelectSource()
{
TW_UINT16 nRet = TWRC_FAILURE;
@@ -257,8 +229,6 @@ bool ImpTwain::SelectSource()
return( TWRC_SUCCESS == nRet );
}
-// -----------------------------------------------------------------------------
-
bool ImpTwain::InitXfer()
{
bool bRet = false;
@@ -279,8 +249,6 @@ bool ImpTwain::InitXfer()
return bRet;
}
-// -----------------------------------------------------------------------------
-
void ImpTwain::ImplOpenSourceManager()
{
if( 1 == nCurState )
@@ -305,8 +273,6 @@ void ImpTwain::ImplOpenSourceManager()
}
}
-// -----------------------------------------------------------------------------
-
void ImpTwain::ImplOpenSource()
{
if( 3 == nCurState )
@@ -326,8 +292,6 @@ void ImpTwain::ImplOpenSource()
}
}
-// -----------------------------------------------------------------------------
-
bool ImpTwain::ImplEnableSource()
{
bool bRet = false;
@@ -358,8 +322,6 @@ bool ImpTwain::ImplEnableSource()
return bRet;
}
-// -----------------------------------------------------------------------------
-
bool ImpTwain::ImplHandleMsg( void* pMsg )
{
TW_UINT16 nRet;
@@ -403,8 +365,6 @@ bool ImpTwain::ImplHandleMsg( void* pMsg )
return( TWRC_DSEVENT == nRet );
}
-// -----------------------------------------------------------------------------
-
void ImpTwain::ImplXfer()
{
if( nCurState == 6 )
@@ -460,15 +420,11 @@ void ImpTwain::ImplXfer()
}
}
-// -----------------------------------------------------------------------------
-
void ImpTwain::ImplFallback( ULONG nEvent )
{
Application::PostUserEvent( LINK( this, ImpTwain, ImplFallbackHdl ), (void*) nEvent );
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
{
const ULONG nEvent = (ULONG) pData;
@@ -541,8 +497,6 @@ IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
return 0L;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( ImpTwain, ImplDestroyHdl, void*, /*p*/ )
{
if( hTwainWnd )
@@ -559,8 +513,6 @@ IMPL_LINK( ImpTwain, ImplDestroyHdl, void*, /*p*/ )
return 0L;
}
-// -----------------------------------------------------------------------------
-
uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame()
{
try
@@ -583,8 +535,6 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame()
return uno::Reference< frame::XFrame >();
}
-// -----------------------------------------------------------------------------
-
uno::Reference< util::XCloseBroadcaster > ImpTwain::ImplGetActiveFrameCloseBroadcaster()
{
try
@@ -599,8 +549,6 @@ uno::Reference< util::XCloseBroadcaster > ImpTwain::ImplGetActiveFrameCloseBroad
return uno::Reference< util::XCloseBroadcaster >();
}
-// -----------------------------------------------------------------------------
-
void ImpTwain::ImplRegisterCloseListener()
{
try
@@ -626,8 +574,6 @@ void ImpTwain::ImplRegisterCloseListener()
OSL_FAIL("ImpTwain::ImplRegisterCloseListener: Could not register as close listener!");
}
-// -----------------------------------------------------------------------------
-
void ImpTwain::ImplDeregisterCloseListener()
{
try
@@ -654,8 +600,6 @@ void ImpTwain::ImplDeregisterCloseListener()
OSL_FAIL("ImpTwain::ImplDeregisterCloseListener: Could not deregister as close listener!");
}
-// -----------------------------------------------------------------------------
-
void SAL_CALL ImpTwain::queryClosing( const lang::EventObject& /*Source*/, sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException)
{
// shall we re-send the close query later on?
@@ -665,23 +609,17 @@ void SAL_CALL ImpTwain::queryClosing( const lang::EventObject& /*Source*/, sal_B
throw util::CloseVetoException();
}
-// -----------------------------------------------------------------------------
-
void SAL_CALL ImpTwain::notifyClosing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException)
{
// should not happen
OSL_FAIL("ImpTwain::notifyClosing called, but we vetoed the closing before!");
}
-// -----------------------------------------------------------------------------
-
void SAL_CALL ImpTwain::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException)
{
// we're not holding any references to the frame, thus noop
}
-// -----------------------------------------------------------------------------
-
void ImpTwain::ImplSendCloseEvent()
{
try
@@ -699,10 +637,6 @@ void ImpTwain::ImplSendCloseEvent()
}
-// ---------
-// - Twain -
-// ---------
-
class Twain
{
uno::Reference< lang::XEventListener > mxListener;
@@ -724,8 +658,6 @@ public:
TwainState GetState() const { return meState; }
};
-// ------------------------------------------------------------------------
-
Twain::Twain() :
mpCurMgr( NULL ),
mpImpTwain( NULL ),
@@ -733,16 +665,12 @@ Twain::Twain() :
{
}
-// ------------------------------------------------------------------------
-
Twain::~Twain()
{
if( mpImpTwain )
mpImpTwain->Destroy();
}
-// ------------------------------------------------------------------------
-
bool Twain::SelectSource( ScannerManager& rMgr )
{
bool bRet;
@@ -763,8 +691,6 @@ bool Twain::SelectSource( ScannerManager& rMgr )
return bRet;
}
-// ------------------------------------------------------------------------
-
bool Twain::PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::XEventListener >& rxListener )
{
bool bRet;
@@ -786,8 +712,6 @@ bool Twain::PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::X
return bRet;
}
-// ------------------------------------------------------------------------
-
IMPL_LINK( Twain, ImpNotifyHdl, ImpTwain*, nEvent )
{
switch( (ULONG)(void*) nEvent )
@@ -840,16 +764,8 @@ IMPL_LINK( Twain, ImpNotifyHdl, ImpTwain*, nEvent )
return 0L;
}
-// -----------
-// - statics -
-// -----------
-
static Twain aTwain;
-// ------------------
-// - ScannerManager -
-// ------------------
-
void ScannerManager::AcquireData()
{
}
@@ -863,8 +779,6 @@ void ScannerManager::ReleaseData()
}
}
-// -----------------------------------------------------------------------------
-
AWT::Size ScannerManager::getSize() throw()
{
AWT::Size aRet;
@@ -890,8 +804,6 @@ AWT::Size ScannerManager::getSize() throw()
return aRet;
}
-// -----------------------------------------------------------------------------
-
SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
{
SEQ( sal_Int8 ) aRet;
@@ -952,8 +864,6 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
return aRet;
}
-// -----------------------------------------------------------------------------
-
SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw()
{
osl::MutexGuard aGuard( maProtector );
@@ -965,8 +875,6 @@ SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw()
return aRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool SAL_CALL ScannerManager::configureScannerAndScan( ScannerContext& rContext, const uno::Reference< lang::XEventListener >& )
throw( ScannerException )
{
@@ -981,8 +889,6 @@ sal_Bool SAL_CALL ScannerManager::configureScannerAndScan( ScannerContext& rCont
return aTwain.SelectSource( *this );
}
-// -----------------------------------------------------------------------------
-
void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const uno::Reference< lang::XEventListener >& rxListener )
throw( ScannerException )
{
@@ -996,8 +902,6 @@ void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const u
aTwain.PerformTransfer( *this, rxListener );
}
-// -----------------------------------------------------------------------------
-
ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext )
throw( ScannerException )
{
@@ -1010,8 +914,6 @@ ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext )
return( ( aTwain.GetState() == TWAIN_STATE_CANCELED ) ? ScanError_ScanCanceled : ScanError_ScanErrorNone );
}
-// -----------------------------------------------------------------------------
-
uno::Reference< awt::XBitmap > SAL_CALL ScannerManager::getBitmap( const ScannerContext& /*rContext*/ )
throw( ScannerException )
{
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index df54c7e..ce315b5 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -95,26 +95,12 @@ using namespace ::com::sun::star::xml::sax;
using namespace ::std;
-// -----------
-// - Defines -
-// -----------
-
#define SVG_EXPORT_ALLPAGES ((sal_Int32)-1)
-// -----------
-// - statics -
-// -----------
-
// Placeholder tag used into the ImplWriteActions method to filter text placeholder fields
static const ::rtl::OUString sPlaceholderTag = ::rtl::OUString::createFromAscii( "<[:isPlaceholder:]>" );
-
-// -------------
-// - SVGExport -
-// -------------
-
-// #110680#
class SVGExport : public SvXMLExport
{
typedef ::std::list< ::basegfx::B2DPolyPolygon > B2DPolyPolygonList;
@@ -148,10 +134,6 @@ private:
SVGExport();
};
-// ------------------------
-// - ObjectRepresentation -
-// ------------------------
-
class ObjectRepresentation
{
private:
@@ -175,10 +157,6 @@ public:
const GDIMetaFile& GetRepresentation() const { return *mpMtf; }
};
-// -------------------
-// - PagePropertySet -
-// -------------------
-
struct PagePropertySet
{
sal_Bool bIsBackgroundVisible;
@@ -196,12 +174,6 @@ struct PagePropertySet
::rtl::OUString sHeaderText;
};
-
-
-// ---------------------------
-// - HashReferenceXInterface -
-// ---------------------------
-
struct HashReferenceXInterface
{
size_t operator()( const Reference< XInterface >& rxIf ) const
@@ -210,48 +182,27 @@ struct HashReferenceXInterface
}
};
-// ---------------------------
-// - HashOUString -
-// ---------------------------
-
struct HashOUString
{
size_t operator()( const ::rtl::OUString& oustr ) const { return static_cast< size_t >( oustr.hashCode() ); }
};
-// ---------------------------
-// - HashUChar -
-// ---------------------------
-
struct HashUChar
{
size_t operator()( const sal_Unicode uchar ) const { return static_cast< size_t >( uchar ); }
};
-// ---------------------------
-// - HashBitmap -
-// ---------------------------
-
struct HashBitmap
{
size_t operator()( const ObjectRepresentation& rObjRep ) const;
};
-// ---------------------------
-// - EqualityBitmap -
-// ---------------------------
-
struct EqualityBitmap
{
bool operator()( const ObjectRepresentation& rObjRep1,
const ObjectRepresentation& rObjRep2 ) const;
};
-
-// -------------
-// - SVGFilter -
-// -------------
-
class SVGFontExport;
class SVGActionWriter;
class EditFieldInfo;
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 243d511..588207b 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -31,10 +31,6 @@
using ::rtl::OUString;
-// -----------
-// - statics -
-// -----------
-
static const char aXMLElemG[] = "g";
static const char aXMLElemDefs[] = "defs";
static const char aXMLElemLine[] = "line";
@@ -50,8 +46,6 @@ static const char aXMLElemLinearGradient[] = "linearGradient";
static const char aXMLElemRadialGradient[] = "radialGradient";
static const char aXMLElemStop[] = "stop";
-// -----------------------------------------------------------------------------
-
static const char aXMLAttrTransform[] = "transform";
static const char aXMLAttrStyle[] = "style";
static const char aXMLAttrId[] = "id";
@@ -98,12 +92,6 @@ static const char aOOOAttrNumberingType[] = NSPREFIX "numbering-type";
static sal_Char const XML_UNO_NAME_NRULE_NUMBERINGTYPE[] = "NumberingType";
static sal_Char const XML_UNO_NAME_NRULE_BULLET_CHAR[] = "BulletChar";
-// -----------------------------------------------------------------------------
-
-
-// ----------------------
-// - SVGAttributeWriter -
-// ----------------------
SVGAttributeWriter::SVGAttributeWriter( SVGExport& rExport, SVGFontExport& rFontExport ) :
mrExport( rExport ),
@@ -113,8 +101,6 @@ SVGAttributeWriter::SVGAttributeWriter( SVGExport& rExport, SVGFontExport& rFont
{
}
-// -----------------------------------------------------------------------------
-
SVGAttributeWriter::~SVGAttributeWriter()
{
if( mpElemPaint )
@@ -123,15 +109,11 @@ SVGAttributeWriter::~SVGAttributeWriter()
delete mpElemFont;
}
-// -----------------------------------------------------------------------------
-
double SVGAttributeWriter::ImplRound( double fValue, sal_Int32 nDecs )
{
return( floor( fValue * pow( 10.0, (int)nDecs ) + 0.5 ) / pow( 10.0, (int)nDecs ) );
}
-// -----------------------------------------------------------------------------
-
void SVGAttributeWriter::ImplGetColorStr( const Color& rColor, ::rtl::OUString& rColorStr )
{
if( rColor.GetTransparency() == 255 )
@@ -143,8 +125,6 @@ void SVGAttributeWriter::ImplGetColorStr( const Color& rColor, ::rtl::OUString&
}
}
-// -----------------------------------------------------------------------------
-
void SVGAttributeWriter::AddColorAttr( const char* pColorAttrName,
const char* pColorOpacityAttrName,
const Color& rColor )
@@ -162,8 +142,6 @@ void SVGAttributeWriter::AddColorAttr( const char* pColorAttrName,
mrExport.AddAttribute( XML_NAMESPACE_NONE, pColorOpacityAttrName, aColorOpacity );
}
-// -----------------------------------------------------------------------------
-
void SVGAttributeWriter::AddPaintAttr( const Color& rLineColor, const Color& rFillColor,
const Rectangle* pObjBoundRect, const Gradient* pFillGradient )
{
@@ -187,8 +165,6 @@ void SVGAttributeWriter::AddPaintAttr( const Color& rLineColor, const Color& rFi
AddColorAttr( aXMLAttrStroke, aXMLAttrStrokeOpacity, rLineColor );
}
-// -----------------------------------------------------------------------------
-
void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradient& rGradient, ::rtl::OUString& rGradientId )
{
if( rObjRect.GetWidth() && rObjRect.GetHeight() &&
@@ -310,8 +286,6 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie
rGradientId = ::rtl::OUString();
}
-// -----------------------------------------------------------------------------
-
void SVGAttributeWriter::SetFontAttr( const Font& rFont )
{
if( rFont != maCurFont )
@@ -429,10 +403,6 @@ void SVGAttributeWriter::setFontFamily()
}
}
-// -------------------
-// - SVGTextWriter -
-// -------------------
-
SVGTextWriter::SVGTextWriter( SVGExport& rExport )
: mrExport( rExport ),
mpContext( NULL ),
@@ -466,30 +436,22 @@ SVGTextWriter::SVGTextWriter( SVGExport& rExport )
{
}
-// -----------------------------------------------------------------------------
-
SVGTextWriter::~SVGTextWriter()
{
endTextParagraph();
}
-// -----------------------------------------------------------------------------
-
void SVGTextWriter::implRegisterInterface( const Reference< XInterface >& rxIf )
{
if( rxIf.is() )
(mrExport.getInterfaceToIdentifierMapper()).registerReference( rxIf );
}
-// -----------------------------------------------------------------------------
-
const ::rtl::OUString & SVGTextWriter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf )
{
return (mrExport.getInterfaceToIdentifierMapper()).getIdentifier( rxIf );
}
-// -----------------------------------------------------------------------------
-
void SVGTextWriter::implMap( const Size& rSz, Size& rDstSz ) const
{
if( mpVDev && mpTargetMapMode )
@@ -498,8 +460,6 @@ void SVGTextWriter::implMap( const Size& rSz, Size& rDstSz ) const
OSL_FAIL( "SVGTextWriter::implMap: invalid virtual device or map mode." );
}
-// -----------------------------------------------------------------------------
-
void SVGTextWriter::implMap( const Point& rPt, Point& rDstPt ) const
{
if( mpVDev && mpTargetMapMode )
@@ -508,8 +468,6 @@ void SVGTextWriter::implMap( const Point& rPt, Point& rDstPt ) const
OSL_FAIL( "SVGTextWriter::implMap: invalid virtual device or map mode." );
}
-// -----------------------------------------------------------------------------
-
void SVGTextWriter::implSetCurrentFont()
{
if( mpVDev )
@@ -526,7 +484,6 @@ void SVGTextWriter::implSetCurrentFont()
OSL_FAIL( "SVGTextWriter::implSetCorrectFontHeight: invalid virtual device." );
}
}
-// -----------------------------------------------------------------------------
template< typename SubType >
sal_Bool SVGTextWriter::implGetTextPosition( const MetaAction* pAction, Point& raPos, sal_Bool& rbEmpty )
@@ -542,8 +499,6 @@ sal_Bool SVGTextWriter::implGetTextPosition( const MetaAction* pAction, Point& r
return sal_False;
}
-// -----------------------------------------------------------------------------
-
template<>
sal_Bool SVGTextWriter::implGetTextPosition<MetaTextRectAction>( const MetaAction* pAction, Point& raPos, sal_Bool& rbEmpty )
{
@@ -558,8 +513,6 @@ sal_Bool SVGTextWriter::implGetTextPosition<MetaTextRectAction>( const MetaActio
return sal_False;
}
-// -----------------------------------------------------------------------------
-
template< typename SubType >
sal_Bool SVGTextWriter::implGetTextPositionFromBitmap( const MetaAction* pAction, Point& raPos, sal_Bool& rbEmpty )
{
@@ -569,8 +522,6 @@ sal_Bool SVGTextWriter::implGetTextPositionFromBitmap( const MetaAction* pAction
return sal_True;
}
-// -----------------------------------------------------------------------------
-
/** setTextPosition
* Set the start position of the next line of text. In case no text is found
* the current action index is updated to the index value we reached while
@@ -703,8 +654,6 @@ sal_Int32 SVGTextWriter::setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nC
}
}
-// -----------------------------------------------------------------------------
-
void SVGTextWriter::setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAction )
{
sal_uLong nCount = rMtf.GetActionSize();
@@ -772,8 +721,6 @@ void SVGTextWriter::setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAc
}
}
-// -----------------------------------------------------------------------------
-
void SVGTextWriter::addFontAttributes( sal_Bool bIsTextContainer )
{
implSetCurrentFont();
@@ -872,8 +819,6 @@ void SVGTextWriter::addFontAttributes( sal_Bool bIsTextContainer )
}
}
-// -----------------------------------------------------------------------------
-
void SVGTextWriter::implSetFontFamily()
{
sal_Int32 nNextTokenPos( 0 );
@@ -895,8 +840,6 @@ void SVGTextWriter::implSetFontFamily()
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontFamily, sFontFamily );
}
-// -----------------------------------------------------------------------------
-
sal_Bool SVGTextWriter::createParagraphEnumeration()
{
if( mrTextShape.is() )
@@ -923,8 +866,6 @@ sal_Bool SVGTextWriter::createParagraphEnumeration()
return sal_False;
}
-// -----------------------------------------------------------------------------
-
sal_Bool SVGTextWriter::nextParagraph()
{
mrTextPortionEnumeration.clear();
@@ -1188,8 +1129,6 @@ sal_Bool SVGTextWriter::nextParagraph()
return sal_False;
}
-// -----------------------------------------------------------------------------
-
sal_Bool SVGTextWriter::nextTextPortion()
{
mrCurrentTextPortion.clear();
@@ -1394,8 +1333,6 @@ sal_Bool SVGTextWriter::nextTextPortion()
return sal_False;
}
-// -----------------------------------------------------------------------------
-
void SVGTextWriter::startTextShape()
{
if( mpTextShapeElem )
@@ -1412,8 +1349,6 @@ void SVGTextWriter::startTextShape()
}
}
-// -----------------------------------------------------------------------------
-
void SVGTextWriter::endTextShape()
{
endTextParagraph();
@@ -1436,8 +1371,6 @@ void SVGTextWriter::endTextShape()
}
-// -----------------------------------------------------------------------------
-
void SVGTextWriter::startTextParagraph()
{
endTextParagraph();
@@ -1473,8 +1406,6 @@ void SVGTextWriter::startTextParagraph()
}
}
-// -----------------------------------------------------------------------------
-
void SVGTextWriter::endTextParagraph()
{
mrCurrentTextPortion.clear();
@@ -1491,8 +1422,6 @@ void SVGTextWriter::endTextParagraph()
}
-// -----------------------------------------------------------------------------
-
void SVGTextWriter::startTextPosition( sal_Bool bExportX, sal_Bool bExportY )
{
endTextPosition();
@@ -1521,8 +1450,6 @@ void SVGTextWriter::startTextPosition( sal_Bool bExportX, sal_Bool bExportY )
mpTextPositionElem = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemTspan, mbIWS, mbIWS );
}
-// -----------------------------------------------------------------------------
-
void SVGTextWriter::endTextPosition()
{
if( mpTextPositionElem )
@@ -1532,8 +1459,6 @@ void SVGTextWriter::endTextPosition()
}
}
-// -----------------------------------------------------------------------------
-
void SVGTextWriter::implExportHyperlinkIds()
{
if( !msHyperlinkIdList.isEmpty() )
@@ -1545,8 +1470,6 @@ void SVGTextWriter::implExportHyperlinkIds()
}
}
-// -----------------------------------------------------------------------------
-
void SVGTextWriter::implWriteBulletChars()
{
if( maBulletListItemMap.empty() )
@@ -1607,8 +1530,6 @@ void SVGTextWriter::implWriteBulletChars()
maBulletListItemMap.clear();
}
-// -----------------------------------------------------------------------------
-
template< typename MetaBitmapActionType >
void SVGTextWriter::writeBitmapPlaceholder( const MetaBitmapActionType* pAction )
{
@@ -1636,8 +1557,6 @@ void SVGTextWriter::writeBitmapPlaceholder( const MetaBitmapActionType* pAction
endTextPosition();
}
-// -----------------------------------------------------------------------------
-
void SVGTextWriter::implWriteEmbeddedBitmaps()
{
if( mpTextEmbeddedBitmapMtf && mpTextEmbeddedBitmapMtf->GetActionSize() )
@@ -1715,8 +1634,6 @@ void SVGTextWriter::implWriteEmbeddedBitmaps()
}
}
-// -----------------------------------------------------------------------------
-
void SVGTextWriter::writeTextPortion( const Point& rPos,
const String& rText,
sal_Bool bApplyMapping )
@@ -1787,8 +1704,6 @@ void SVGTextWriter::writeTextPortion( const Point& rPos,
}
-// -----------------------------------------------------------------------------
-
void SVGTextWriter::implWriteTextPortion( const Point& rPos,
const String& rText,
Color aTextColor,
@@ -1897,10 +1812,6 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos,
mnTextWidth += mpVDev->GetTextWidth( sTextContent );
}
-// -------------------
-// - SVGActionWriter -
-// -------------------
-
SVGActionWriter::SVGActionWriter( SVGExport& rExport, SVGFontExport& rFontExport ) :
mnCurGradientId( 1 ),
mnCurMaskId( 1 ),
@@ -1918,16 +1829,12 @@ SVGActionWriter::SVGActionWriter( SVGExport& rExport, SVGFontExport& rFontExport
maTextWriter.setVirtualDevice( mpVDev, maTargetMapMode );
}
-// -----------------------------------------------------------------------------
-
SVGActionWriter::~SVGActionWriter()
{
DBG_ASSERT( !mpContext, "Not all contexts are closed" );
delete mpVDev;
}
-// -----------------------------------------------------------------------------
-
long SVGActionWriter::ImplMap( sal_Int32 nVal ) const
{
Size aSz( nVal, nVal );
@@ -1935,22 +1842,16 @@ long SVGActionWriter::ImplMap( sal_Int32 nVal ) const
return( ImplMap( aSz, aSz ).Width() );
}
-// -----------------------------------------------------------------------------
-
Point& SVGActionWriter::ImplMap( const Point& rPt, Point& rDstPt ) const
{
return( rDstPt = mpVDev->LogicToLogic( rPt, mpVDev->GetMapMode(), maTargetMapMode ) );
}
-// -----------------------------------------------------------------------------
-
Size& SVGActionWriter::ImplMap( const Size& rSz, Size& rDstSz ) const
{
return( rDstSz = mpVDev->LogicToLogic( rSz, mpVDev->GetMapMode(), maTargetMapMode ) );
}
-// -----------------------------------------------------------------------------
-
Rectangle& SVGActionWriter::ImplMap( const Rectangle& rRect, Rectangle& rDstRect ) const
{
Point aTL( rRect.TopLeft() );
@@ -1959,9 +1860,6 @@ Rectangle& SVGActionWriter::ImplMap( const Rectangle& rRect, Rectangle& rDstRect
return( rDstRect = Rectangle( ImplMap( aTL, aTL ), ImplMap( aSz, aSz ) ) );
}
-
-// -----------------------------------------------------------------------------
-
Polygon& SVGActionWriter::ImplMap( const Polygon& rPoly, Polygon& rDstPoly ) const
{
rDstPoly = Polygon( rPoly.GetSize() );
@@ -1975,8 +1873,6 @@ Polygon& SVGActionWriter::ImplMap( const Polygon& rPoly, Polygon& rDstPoly ) con
return( rDstPoly );
}
-// -----------------------------------------------------------------------------
-
PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon& rDstPolyPoly ) const
{
Polygon aPoly;
@@ -1991,8 +1887,6 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon
return( rDstPolyPoly );
}
-// -----------------------------------------------------------------------------
-
::rtl::OUString SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly, sal_Bool bLine )
{
OUString aPathData;
@@ -2058,8 +1952,6 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon
return aPathData;
}
-// -----------------------------------------------------------------------------
-
sal_uLong SVGActionWriter::GetChecksum( const MetaAction* pAction )
{
GDIMetaFile aMtf;
@@ -2069,8 +1961,6 @@ sal_uLong SVGActionWriter::GetChecksum( const MetaAction* pAction )
return aMtf.GetChecksum();
}
-// -----------------------------------------------------------------------------
-
void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2,
const Color* pLineColor, sal_Bool bApplyMapping )
{
@@ -2103,8 +1993,6 @@ void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2,
}
}
-// -----------------------------------------------------------------------------
-
void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nRadY,
sal_Bool bApplyMapping )
{
@@ -2131,8 +2019,6 @@ void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nR
}
}
-// -----------------------------------------------------------------------------
-
void SVGActionWriter::ImplWriteEllipse( const Point& rCenter, long nRadX, long nRadY,
sal_Bool bApplyMapping )
{
@@ -2153,8 +2039,6 @@ void SVGActionWriter::ImplWriteEllipse( const Point& rCenter, long nRadX, long n
}
}
-// -----------------------------------------------------------------------------
-
void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bLineOnly,
sal_Bool bApplyMapping )
{
@@ -2174,8 +2058,6 @@ void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bo
}
}
-// -----------------------------------------------------------------------------
-
void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool bApplyMapping )
{
PolyPolygon aPolyPoly;
@@ -2267,8 +2149,6 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool
ImplWritePolyPolygon( aPolyPoly, bLineOnly, sal_False );
}
-// -----------------------------------------------------------------------------
-
void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly,
const Hatch* pHatch,
const Gradient* pGradient,
@@ -2326,8 +2206,6 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly,
}
}
-// -----------------------------------------------------------------------------
-
void SVGActionWriter::ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient,
sal_uInt32 nWriteFlags, sal_Bool bApplyMapping )
{
@@ -2349,8 +2227,6 @@ void SVGActionWriter::ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const G
}
}
-// -----------------------------------------------------------------------------
-
void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly,
const Gradient& rGradient )
{
@@ -2501,8 +2377,6 @@ Color SVGActionWriter::ImplGetGradientColor( const Color& rStartColor,
return Color( (sal_uInt8)nNewRed, (sal_uInt8)nNewGreen, (sal_uInt8)nNewBlue );
}
-// -----------------------------------------------------------------------------
-
void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf,
const Point& rDestPt,
const Size& rDestSize,
@@ -2562,8 +2436,6 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf,
}
}
-// -----------------------------------------------------------------------------
-
void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
const sal_Int32* pDXArray, long nWidth,
sal_Bool bApplyMapping )
@@ -2838,8 +2710,6 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
}
}
-// -----------------------------------------------------------------------------
-
void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx,
const Point& rPt, const Size& rSz,
const Point& rSrcPt, const Size& rSrcSz,
@@ -2891,8 +2761,6 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx,
}
}
-// -----------------------------------------------------------------------------
-
void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
sal_uInt32 nWriteFlags,
const ::rtl::OUString* pElementId,
@@ -3784,7 +3652,6 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
}
-// -----------------------------------------------------------------------------
Font SVGActionWriter::ImplSetCorrectFontHeight() const
{
Font aFont( mpVDev->GetFont() );
@@ -3797,8 +3664,6 @@ Font SVGActionWriter::ImplSetCorrectFontHeight() const
return aFont;
}
-// -----------------------------------------------------------------------------
-
void SVGActionWriter::WriteMetaFile( const Point& rPos100thmm,
const Size& rSize100thmm,
const GDIMetaFile& rMtf,
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx
index e414453..24a3d6d 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -30,10 +30,6 @@
#include "drawdoc.hxx"
#include "sdcgmfilter.hxx"
-// -----------
-// - Defines -
-// -----------
-
#define CGM_IMPORT_CGM 0x00000001
#define CGM_IMPORT_IM 0x00000002
@@ -45,19 +41,10 @@
#define CGM_BIG_ENDIAN 0x00020000
#define CGM_LITTLE_ENDIAN 0x00040000
-// --------------
-// - Namespaces -
-// --------------
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::frame;
-// ------------
-// - Typedefs -
-// ------------
-
-
typedef sal_uInt32 ( SAL_CALL *ImportCGMPointer )( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& );
typedef sal_Bool ( SAL_CALL *ExportCGMPointer )( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* );
@@ -67,23 +54,15 @@ extern "C" sal_uInt32 ImportCGM( ::rtl::OUString&, Reference< XModel >&, sal_uIn
#endif
-// ---------------
-// - SdPPTFilter -
-// ---------------
-
SdCGMFilter::SdCGMFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) :
SdFilter( rMedium, rDocShell, bShowProgress )
{
}
-// -----------------------------------------------------------------------------
-
SdCGMFilter::~SdCGMFilter()
{
}
-// -----------------------------------------------------------------------------
-
sal_Bool SdCGMFilter::Import()
{
#ifndef DISABLE_DYNLOADING
@@ -136,8 +115,6 @@ sal_Bool SdCGMFilter::Import()
return bRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool SdCGMFilter::Export()
{
#ifdef DISABLE_DYNLOADING
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 0f367f6..a467613 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -66,10 +66,6 @@
#include "unomodel.hxx"
#include <vcl/virdev.hxx>
-// --------------
-// - Namespaces -
-// --------------
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
@@ -77,17 +73,9 @@ using namespace ::com::sun::star::io;
using namespace ::com::sun::star::datatransfer;
using namespace ::com::sun::star::datatransfer::clipboard;
-// -----------
-// - Defines -
-// -----------
-
#define SDTRANSFER_OBJECTTYPE_DRAWMODEL 0x00000001
#define SDTRANSFER_OBJECTTYPE_DRAWOLE 0x00000002
-// ------------------
-// - SdTransferable -
-// ------------------
-
SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, sal_Bool bInitOnGetData )
: mpPageDocShell( NULL )
, mpOLEDataHelper( NULL )
@@ -120,8 +108,6 @@ SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView,
CreateData();
}
-// -----------------------------------------------------------------------------
-
SdTransferable::~SdTransferable()
{
if( mpSourceDoc )
@@ -160,8 +146,6 @@ SdTransferable::~SdTransferable()
}
-// -----------------------------------------------------------------------------
-
void SdTransferable::CreateObjectReplacement( SdrObject* pObj )
{
if( pObj )
@@ -256,8 +240,6 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj )
}
}
-// -----------------------------------------------------------------------------
-
void SdTransferable::CreateData()
{
if( mpSdDrawDocument && !mpSdViewIntern )
@@ -346,8 +328,6 @@ void SdTransferable::CreateData()
}
}
-// -----------------------------------------------------------------------------
-
static sal_Bool lcl_HasOnlyControls( SdrModel* pModel )
{
sal_Bool bOnlyControls = sal_False; // default if there are no objects
@@ -378,8 +358,6 @@ static sal_Bool lcl_HasOnlyControls( SdrModel* pModel )
return bOnlyControls;
}
-// -----------------------------------------------------------------------------
-
static bool lcl_HasOnlyOneTable( SdrModel* pModel )
{
if ( pModel )
@@ -394,8 +372,6 @@ static bool lcl_HasOnlyOneTable( SdrModel* pModel )
return false;
}
-// -----------------------------------------------------------------------------
-
void SdTransferable::AddSupportedFormats()
{
if( !mbPageTransferable || mbPageTransferablePersistent )
@@ -458,8 +434,6 @@ void SdTransferable::AddSupportedFormats()
}
}
-// -----------------------------------------------------------------------------
-
sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor )
{
if (SD_MOD()==NULL)
@@ -584,8 +558,6 @@ sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor )
return bOK;
}
-// -----------------------------------------------------------------------------
-
sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject, sal_uInt32 nObjectType, const DataFlavor& )
{
sal_Bool bRet = sal_False;
@@ -668,16 +640,12 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject
return bRet;
}
-// -----------------------------------------------------------------------------
-
void SdTransferable::DragFinished( sal_Int8 nDropAction )
{
if( mpSdView )
( (::sd::View*) mpSdView )->DragFinished( nDropAction );
}
-// -----------------------------------------------------------------------------
-
void SdTransferable::ObjectReleased()
{
if( this == SD_MOD()->pTransferClip )
@@ -690,8 +658,6 @@ void SdTransferable::ObjectReleased()
SD_MOD()->pTransferSelection = NULL;
}
-// -----------------------------------------------------------------------------
-
void SdTransferable::SetObjectDescriptor( const TransferableObjectDescriptor& rObjDesc )
{
delete mpObjDesc;
@@ -699,8 +665,6 @@ void SdTransferable::SetObjectDescriptor( const TransferableObjectDescriptor& rO
PrepareOLE( rObjDesc );
}
-// -----------------------------------------------------------------------------
-
void SdTransferable::SetPageBookmarks( const std::vector<rtl::OUString> &rPageBookmarks, sal_Bool bPersistent )
{
if( mpSourceDoc )
@@ -743,8 +707,6 @@ void SdTransferable::SetPageBookmarks( const std::vector<rtl::OUString> &rPageBo
}
}
-// -----------------------------------------------------------------------------
-
sal_Int64 SAL_CALL SdTransferable::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException )
{
sal_Int64 nRet;
@@ -786,8 +748,6 @@ sal_Int32 SdTransferable::GetUserDataCount (void) const
return ::boost::shared_ptr<UserData>();
}
-// -----------------------------------------------------------------------------
-
namespace
{
class theSdTransferableUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSdTransferableUnoTunnelId > {};
@@ -798,8 +758,6 @@ const ::com::sun::star::uno::Sequence< sal_Int8 >& SdTransferable::getUnoTunnelI
return theSdTransferableUnoTunnelId::get().getSeq();
}
-// -----------------------------------------------------------------------------
-
SdTransferable* SdTransferable::getImplementation( const Reference< XInterface >& rxData ) throw()
{
try
@@ -813,9 +771,6 @@ SdTransferable* SdTransferable::getImplementation( const Reference< XInterface >
return NULL;
}
-// -----------------------------------------------------------------------------
-
-// SfxListener
void SdTransferable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
const SdrHint* pSdrHint = dynamic_cast< const SdrHint* >( &rHint );
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 420c6a3..28f4c66 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -35,16 +35,8 @@
#include <vcl/msgbox.hxx>
#include <vcl/metaact.hxx>
-// -----------
-// - Defines -
-// -----------
-
#define VECTORIZE_MAX_EXTENT 512
-// ------------------
-// - SdVectorizeDlg -
-// ------------------
-
SdVectorizeDlg::SdVectorizeDlg(
Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) :
ModalDialog ( pParent, SdResId( DLG_VECTORIZE ) ),
@@ -86,14 +78,10 @@ SdVectorizeDlg::SdVectorizeDlg(
InitPreviewBmp();
}
-// -----------------------------------------------------------------------------
-
SdVectorizeDlg::~SdVectorizeDlg()
{
}
-// -----------------------------------------------------------------------------
-
Rectangle SdVectorizeDlg::GetRect( const Size& rDispSize, const Size& rBmpSize ) const
{
Rectangle aRect;
@@ -124,8 +112,6 @@ Rectangle SdVectorizeDlg::GetRect( const Size& rDispSize, const Size& rBmpSize )
return aRect;
}
-// -----------------------------------------------------------------------------
-
void SdVectorizeDlg::InitPreviewBmp()
{
const Rectangle aRect( GetRect( aBmpWin.GetSizePixel(), aBmp.GetSizePixel() ) );
@@ -135,8 +121,6 @@ void SdVectorizeDlg::InitPreviewBmp()
aBmpWin.SetGraphic( aPreviewBmp );
}
-// -----------------------------------------------------------------------------
-
Bitmap SdVectorizeDlg::GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale )
{
Bitmap aNew( rBmp );
@@ -156,8 +140,6 @@ Bitmap SdVectorizeDlg::GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale )
return aNew;
}
-// -----------------------------------------------------------------------------
-
void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf )
{
mpDocSh->SetWaitCursor( sal_True );
@@ -231,8 +213,6 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf )
mpDocSh->SetWaitCursor( sal_False );
}
-// -----------------------------------------------------------------------------
-
void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf,
long nPosX, long nPosY, long nWidth, long nHeight )
{
@@ -273,16 +253,12 @@ void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf,
rMtf.AddAction( new MetaRectAction( aRect ) );
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( SdVectorizeDlg, ProgressHdl, void*, pData )
{
aPrgs.SetValue( (sal_uInt16)(sal_uLong) pData );
return 0L;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK_NOARG(SdVectorizeDlg, ClickPreviewHdl)
{
Calculate( aBmp, aMtf );
@@ -292,8 +268,6 @@ IMPL_LINK_NOARG(SdVectorizeDlg, ClickPreviewHdl)
return 0L;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK_NOARG(SdVectorizeDlg, ClickOKHdl)
{
if( aBtnPreview.IsEnabled() )
@@ -305,8 +279,6 @@ IMPL_LINK_NOARG(SdVectorizeDlg, ClickOKHdl)
return 0L;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( SdVectorizeDlg, ToggleHdl, CheckBox*, pCb )
{
if( pCb->IsChecked() )
@@ -325,16 +297,12 @@ IMPL_LINK( SdVectorizeDlg, ToggleHdl, CheckBox*, pCb )
return 0L;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK_NOARG(SdVectorizeDlg, ModifyHdl)
{
aBtnPreview.Enable();
return 0L;
}
-// -----------------------------------------------------------------------------
-
void SdVectorizeDlg::LoadSettings()
{
SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream(
@@ -366,8 +334,6 @@ void SdVectorizeDlg::LoadSettings()
ToggleHdl( &aCbFillHoles );
}
-// -----------------------------------------------------------------------------
-
void SdVectorizeDlg::SaveSettings() const
{
SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream(
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index bd56aba..5473ead 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -28,9 +28,7 @@
#include <svx/dlgutil.hxx>
#include "sddllapi.h"
-// -----------------
-// - Option ranges -
-// -----------------
+// Option ranges
#define SD_OPTIONS_NONE 0x00000000
#define SD_OPTIONS_ALL 0xffffffff
@@ -43,20 +41,12 @@
#define SD_OPTIONS_GRID 0x00000020
#define SD_OPTIONS_PRINT 0x00000040
-// ------------
-// - Forwards -
-// ------------
-
class SdOptions;
namespace sd {
class FrameView;
}
-// -----------------
-// - SdOptionsItem -
-// -----------------
-
class SdOptionsGeneric;
class SD_DLLPUBLIC SdOptionsItem : public ::utl::ConfigItem
@@ -82,10 +72,6 @@ public:
void SetModified();
};
-// --------------------
-// - SdOptionsGeneric -
-// --------------------
-
class SD_DLLPUBLIC SdOptionsGeneric
{
friend class SdOptionsItem;
@@ -128,10 +114,6 @@ public:
static bool isMetricSystem();
};
-// -------------------
-// - SdOptionsLayout -
-// -------------------
-
class SD_DLLPUBLIC SdOptionsLayout : public SdOptionsGeneric
{
private:
@@ -173,8 +155,6 @@ public:
void SetDefTab( sal_uInt16 nTab ) { if( nDefTab != nTab ) { OptionsChanged(); nDefTab = nTab; } }
};
-// -----------------------------------------------------------------------------
-
class SD_DLLPUBLIC SdOptionsLayoutItem : public SfxPoolItem
{
public:
@@ -192,10 +172,6 @@ private:
SdOptionsLayout maOptionsLayout;
};
-// ---------------------
-// - SdOptionsContents -
-// ---------------------
-
class SD_DLLPUBLIC SdOptionsContents : public SdOptionsGeneric
{
private:
@@ -213,8 +189,6 @@ public:
sal_Bool operator==( const SdOptionsContents& rOpt ) const;
};
-// -----------------------------------------------------------------------------
-
class SD_DLLPUBLIC SdOptionsContentsItem : public SfxPoolItem
{
public:
@@ -231,10 +205,6 @@ private:
SdOptionsContents maOptionsContents;
};
-// -----------------
-// - SdOptionsMisc -
-// -----------------
-
class SD_DLLPUBLIC SdOptionsMisc : public SdOptionsGeneric
{
private:
@@ -364,8 +334,6 @@ public:
void SetShowComments( sal_Bool bShow ) { if( bShowComments != bShow ) { OptionsChanged(); bShowComments = bShow; } }
};
-// -----------------------------------------------------------------------------
-
class SD_DLLPUBLIC SdOptionsMiscItem : public SfxPoolItem
{
public:
@@ -384,10 +352,6 @@ private:
SdOptionsMisc maOptionsMisc;
};
-// -----------------
-// - SdOptionsSnap -
-// -----------------
-
class SD_DLLPUBLIC SdOptionsSnap : public SdOptionsGeneric
{
private:
@@ -439,8 +403,6 @@ public:
void SetEliminatePolyPointLimitAngle( sal_Int16 nIn ) { if( nBezAngle != nIn ) { OptionsChanged(); nBezAngle = nIn; } }
};
-// -----------------------------------------------------------------------------
-
class SD_DLLPUBLIC SdOptionsSnapItem : public SfxPoolItem
{
public:
@@ -458,10 +420,6 @@ private:
SdOptionsSnap maOptionsSnap;
};
-// -----------------
-// - SdOptionsZoom -
-// -----------------
-
class SdOptionsZoom : public SdOptionsGeneric
{
private:
@@ -486,12 +444,6 @@ public:
void SetScale( sal_Int32 nInX, sal_Int32 nInY ) { if( nX != nInX || nY != nInY ) { OptionsChanged(); nX = nInX; nY = nInY; } }
};
-// -----------------------------------------------------------------------------
-
-// -----------------
-// - SdOptionsGrid -
-// -----------------
-
class SdOptionsGrid : public SdOptionsGeneric, public SvxOptionsGrid
{
protected:
@@ -531,8 +483,6 @@ public:
void SetEqualGrid( sal_Bool bSet ) { if( bSet != SvxOptionsGrid::GetEqualGrid() ) { OptionsChanged(); SvxOptionsGrid::SetEqualGrid( bSet ); } }
};
-// -----------------------------------------------
-
class SdOptionsGridItem : public SvxGridItem
{
@@ -542,10 +492,6 @@ public:
void SetOptions( SdOptions* pOpts ) const;
};
-// ------------------
-// - SdOptionsPrint -
-// ------------------
-
class SD_DLLPUBLIC SdOptionsPrint : public SdOptionsGeneric
{
private:
@@ -630,8 +576,6 @@ public:
void SetHandoutPages( sal_uInt16 nHandoutPages ) { if( nHandoutPages != mnHandoutPages ) { OptionsChanged(); mnHandoutPages = nHandoutPages; } }
};
-// -----------------------------------------------------------------------------
-
class SD_DLLPUBLIC SdOptionsPrintItem : public SfxPoolItem
{
public:
@@ -650,10 +594,6 @@ private:
SdOptionsPrint maOptionsPrint;
};
-// -------------
-// - SdOptions -
-// -------------
-
class SdOptions : public SdOptionsLayout, public SdOptionsContents,
public SdOptionsMisc, public SdOptionsSnap,
public SdOptionsZoom, public SdOptionsGrid,
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index 8b2e77e4..ec35436 100644
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -19,10 +19,6 @@
#include "sfx2/sfx.hrc"
#include "cfgids.hxx"
-// -----------
-// - Defines -
-// -----------
-
#define IMAGE_MASK_STDCOLOR Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
// Bitmaps for Tree-ListBox in Effects-TabDialog
@@ -41,13 +37,10 @@
// Bitmaps for ValueSet in EffectWindow
-// -----------------------------------------------------------------------------
-
#define BMP_FOIL_NONE RID_APP_START+120
#define BMP_GROUP RID_APP_START+121
#define BMP_WAIT_ICON RID_APP_START+124
-// -----------------------------------------------------------------------------
// additional effects
#define BMP_FADE_EFFECT_INDICATOR RID_SD_START+331
@@ -192,8 +185,6 @@
#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL (RID_SD_START+589)
#define BMP_PRESENTERSCREEN_VIEW_BACKGROUND (RID_SD_START+590)
-// -----------------------------------------------------------------------------
-
// ResourceIDs for Popup-Menus do not need a dummy string!!!
#define RID_DRAW_TEXTOBJ_POPUP RID_APP_START+43
diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx
index cfbd6be..e90f362 100644
--- a/sd/source/ui/slideshow/showwindow.hxx
+++ b/sd/source/ui/slideshow/showwindow.hxx
@@ -29,25 +29,12 @@
#include "slideshowimpl.hxx"
-// ----------------
-// - SdShowWindow -
-// ----------------
-
-
namespace sd {
class SlideshowImpl;
-// -----------
-// - Defines -
-// -----------
-
#define SLIDE_NO_TIMEOUT SAL_MAX_INT32
-// ---------
-// - Enums -
-// ---------
-
enum ShowWindowMode
{
SHOWWINDOWMODE_NORMAL = 0,
diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx
index eca0aeb..1ae07ad 100644
--- a/svtools/inc/svtools/grfmgr.hxx
+++ b/svtools/inc/svtools/grfmgr.hxx
@@ -23,10 +23,6 @@
#include <vcl/graph.hxx>
#include <svtools/svtdllapi.h>
-// -----------
-// - Defines -
-// -----------
-
#define GRFMGR_DRAW_NOTCACHED 0x00000000UL
#define GRFMGR_DRAW_CACHED 0x00000001UL
#define GRFMGR_DRAW_SMOOTHSCALE 0x00000002UL
@@ -35,18 +31,14 @@
#define GRFMGR_DRAW_NO_SUBSTITUTE 0x00000010UL
#define GRFMGR_DRAW_STANDARD (GRFMGR_DRAW_CACHED|GRFMGR_DRAW_SMOOTHSCALE)
-// --------------------
-// - AutoSwap Defines -
-// --------------------
+// AutoSwap defines
#define GRFMGR_AUTOSWAPSTREAM_LINK ((SvStream*)0x00000000UL)
#define GRFMGR_AUTOSWAPSTREAM_LOADED ((SvStream*)0xfffffffdUL)
#define GRFMGR_AUTOSWAPSTREAM_TEMP ((SvStream*)0xfffffffeUL)
#define GRFMGR_AUTOSWAPSTREAM_NONE ((SvStream*)0xffffffffUL)
-// ----------------------
-// - Adjustment Defines -
-// ----------------------
+// Adjustment defines
#define ADJUSTMENT_NONE 0x00000000UL
#define ADJUSTMENT_DRAWMODE 0x00000001UL
@@ -56,10 +48,6 @@
#define ADJUSTMENT_TRANSPARENCY 0x00000010UL
#define ADJUSTMENT_ALL 0xFFFFFFFFUL
-// ---------
-// - Enums -
-// ---------
-
enum GraphicDrawMode
{
GRAPHICDRAWMODE_STANDARD = 0,
@@ -68,10 +56,6 @@ enum GraphicDrawMode
GRAPHICDRAWMODE_WATERMARK = 3
};
-// ------------
-// - Forwards -
-// ------------
-
class GraphicManager;
class SvStream;
class BitmapWriteAccess;
@@ -80,10 +64,6 @@ class VirtualDevice;
struct GrfSimpleCacheObj;
struct ImplTileInfo;
-// ---------------
-// - GraphicAttr -
-// ---------------
-
class SVT_DLLPUBLIC GraphicAttr
{
private:
@@ -174,10 +154,6 @@ public:
friend SvStream& operator>>( SvStream& rIStm, GraphicAttr& rAttr );
};
-// -----------------
-// - GraphicObject -
-// -----------------
-
class SVT_DLLPUBLIC GraphicObject : public SvDataCopyStream
{
friend class GraphicManager;
@@ -519,10 +495,6 @@ public:
static void InspectForGraphicObjectImageURL( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIf, std::vector< rtl::OUString >& rvEmbedImgUrls );
};
-// ------------------
-// - GraphicManager -
-// ------------------
-
typedef ::std::vector< GraphicObject* > GraphicObjectList_impl;
class SVT_DLLPUBLIC GraphicManager
diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx
index d7f2a35..342b29c 100644
--- a/svtools/inc/svtools/transfer.hxx
+++ b/svtools/inc/svtools/transfer.hxx
@@ -40,10 +40,6 @@
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/io/XInputStream.hpp>
-// ------------------------
-// - Forward declarations -
-// ------------------------
-
class Bitmap;
class GDIMetaFile;
class Graphic;
@@ -55,9 +51,7 @@ class FileList;
class Window;
class Link;
-// ---------------------
-// - Drag&Drop defines -
-// ---------------------
+// Drag&Drop defines
#define DND_ACTION_NONE ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_NONE
#define DND_ACTION_COPY ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_COPY
@@ -68,10 +62,6 @@ class Link;
#define DND_POINTER_NONE 0
#define DND_IMAGE_NONE 0
-// --------------------------------
-// - TransferableObjectDescriptor -
-// --------------------------------
-
struct TransferableObjectDescriptor
{
SvGlobalName maClassName;
@@ -93,10 +83,6 @@ struct TransferableObjectDescriptor
SVT_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc );
};
-// -------------------
-// - AcceptDragEvent -
-// -------------------
-
struct AcceptDropEvent
{
sal_Int8 mnAction;
@@ -121,10 +107,6 @@ struct AcceptDropEvent
mbDefault( sal_False ) {}
};
-// --------------------
-// - ExecuteDropEvent -
-// --------------------
-
struct ExecuteDropEvent
{
sal_Int8 mnAction;
@@ -145,10 +127,6 @@ struct ExecuteDropEvent
mbDefault( sal_False ) {}
};
-// ----------------------
-// - TransferableHelper -
-// ----------------------
-
class SVT_DLLPUBLIC TransferableHelper : public ::cppu::WeakImplHelper4< ::com::sun::star::datatransfer::XTransferable,
::com::sun::star::datatransfer::clipboard::XClipboardOwner,
::com::sun::star::datatransfer::dnd::XDragSourceListener,
@@ -285,10 +263,6 @@ public:
virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException );
};
-// --------------------------
-// - TransferableDataHelper -
-// --------------------------
-
struct TransferableDataHelper_Impl;
class SVT_DLLPUBLIC TransferableDataHelper
@@ -391,10 +365,6 @@ public:
sal_Bool bCompareParameters = sal_False );
};
-// --------------------
-// - DragSourceHelper -
-// --------------------
-
class SVT_DLLPUBLIC DragSourceHelper
{
private:
@@ -441,10 +411,6 @@ public:
virtual ~DragSourceHelper();
};
-// --------------------
-// - DropTargetHelper -
-// --------------------
-
class SVT_DLLPUBLIC DropTargetHelper
{
private:
@@ -513,11 +479,6 @@ public:
};
-
-//------------------------
-// TransferDataContainer
-//------------------------
-
struct TransferDataContainer_Impl;
class SVT_DLLPUBLIC TransferDataContainer : public TransferableHelper
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index e67ddfd..87e8e353 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -36,18 +36,11 @@
#include <itemholder2.hxx>
#include <sal/macros.h>
-// -----------
-// - statics -
-// -----------
static sal_uInt16 aDPIArray[] = { 72, 96, 150, 200, 300, 600 };
#define DPI_COUNT (SAL_N_ELEMENTS(aDPIArray))
-// -----------
-// - Defines -
-// -----------
-
#define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Print/Option"))
#define ROOTNODE_PRINTOPTION OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Print/Option"))
@@ -63,19 +56,11 @@ static sal_uInt16 aDPIArray[] = { 72, 96, 150, 200, 300, 600 };
#define PROPERTYNAME_CONVERTTOGREYSCALES OUString(RTL_CONSTASCII_USTRINGPARAM("ConvertToGreyscales"))
#define PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT OUString(RTL_CONSTASCII_USTRINGPARAM("PDFAsStandardPrintJobFormat"))
-// --------------
-// - Namespaces -
-// --------------
-
using namespace ::utl;
using namespace ::rtl;
using namespace ::osl;
using namespace ::com::sun::star::uno;
-// -----------
-// - statics -
-// -----------
-
static SvtPrintOptions_Impl* pPrinterOptionsDataContainer = NULL;
static SvtPrintOptions_Impl* pPrintFileOptionsDataContainer = NULL;
@@ -85,25 +70,12 @@ sal_Int32 SvtPrinterOptions::m_nRefCount = 0;
SvtPrintOptions_Impl* SvtPrintFileOptions::m_pStaticDataContainer = NULL;
sal_Int32 SvtPrintFileOptions::m_nRefCount = 0;
-// ------------------------
-// - SvtPrintOptions_Impl -
-// ------------------------
-
class SvtPrintOptions_Impl
{
public:
-
-//---------------------------------------------------------------------------------------------------------
-// constructor / destructor
-//---------------------------------------------------------------------------------------------------------
-
SvtPrintOptions_Impl( const OUString& rConfigRoot );
~SvtPrintOptions_Impl();
-//---------------------------------------------------------------------------------------------------------
-// public interface
-//---------------------------------------------------------------------------------------------------------
-
sal_Bool IsReduceTransparency() const ;
sal_Int16 GetReducedTransparencyMode() const ;
sal_Bool IsReduceGradients() const ;
@@ -531,25 +503,14 @@ void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp,
}
}
-// -----------------------------------------------------------------------------
-
-
-// -----------------------
-// - SvtBasePrintOptions -
-// -----------------------
-
SvtBasePrintOptions::SvtBasePrintOptions()
{
}
-// -----------------------------------------------------------------------------
-
SvtBasePrintOptions::~SvtBasePrintOptions()
{
}
-// -----------------------------------------------------------------------------
-
Mutex& SvtBasePrintOptions::GetOwnStaticMutex()
{
// Initialize static mutex only for one time!
@@ -572,184 +533,138 @@ Mutex& SvtBasePrintOptions::GetOwnStaticMutex()
return *pMutex;
}
-// -----------------------------------------------------------------------------
-
sal_Bool SvtBasePrintOptions::IsReduceTransparency() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsReduceTransparency();
}
-// -----------------------------------------------------------------------------
-
sal_Int16 SvtBasePrintOptions::GetReducedTransparencyMode() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->GetReducedTransparencyMode();
}
-// -----------------------------------------------------------------------------
-
sal_Bool SvtBasePrintOptions::IsReduceGradients() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsReduceGradients();
}
-// -----------------------------------------------------------------------------
-
sal_Int16 SvtBasePrintOptions::GetReducedGradientMode() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->GetReducedGradientMode();
}
-// -----------------------------------------------------------------------------
-
sal_Int16 SvtBasePrintOptions::GetReducedGradientStepCount() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->GetReducedGradientStepCount();
}
-// -----------------------------------------------------------------------------
-
sal_Bool SvtBasePrintOptions::IsReduceBitmaps() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsReduceBitmaps();
}
-// -----------------------------------------------------------------------------
-
sal_Int16 SvtBasePrintOptions::GetReducedBitmapMode() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->GetReducedBitmapMode();
}
-// -----------------------------------------------------------------------------
-
sal_Int16 SvtBasePrintOptions::GetReducedBitmapResolution() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->GetReducedBitmapResolution();
}
-// -----------------------------------------------------------------------------
-
sal_Bool SvtBasePrintOptions::IsReducedBitmapIncludesTransparency() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsReducedBitmapIncludesTransparency();
}
-// -----------------------------------------------------------------------------
-
sal_Bool SvtBasePrintOptions::IsConvertToGreyscales() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsConvertToGreyscales();
}
-// -----------------------------------------------------------------------------
-
sal_Bool SvtBasePrintOptions::IsPDFAsStandardPrintJobFormat() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsPDFAsStandardPrintJobFormat();
}
-// -----------------------------------------------------------------------------
-
void SvtBasePrintOptions::SetReduceTransparency( sal_Bool bState )
{
MutexGuard aGuard( GetOwnStaticMutex() );
m_pDataContainer->SetReduceTransparency( bState ) ;
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list