[Libreoffice-commits] .: binfilter/filter binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Sep 6 00:53:04 PDT 2011
binfilter/filter/source/bf_offwrp/bf_wrapper.cxx | 42 ++++++++++++++++++++++-
binfilter/filter/source/bf_offwrp/bf_wrapper.hxx | 12 ++++++
binfilter/inc/bf_sw/viewsh.hxx | 42 -----------------------
3 files changed, 53 insertions(+), 43 deletions(-)
New commits:
commit 85ea9bf68e1d57dd088978349246b9433c0fa87e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 6 08:46:53 2011 +0100
callcatcher: expand and remove
diff --git a/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx b/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
index 9e6d0d6..6be3059 100644
--- a/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
+++ b/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
@@ -56,7 +56,47 @@ static SchDLL* pSchDLL = 0L;
static SmDLL* pSmDLL = 0L;
static bf_OfficeWrapper* pOfficeWrapper = 0L;
-SFX_IMPL_XSERVICEINFO( bf_OfficeWrapper, "com.sun.star.office.OfficeWrapper", "com.sun.star.comp.desktop.OfficeWrapper" )
+/* XServiceInfo */
+UNOOUSTRING SAL_CALL bf_OfficeWrapper::getImplementationName() throw( UNORUNTIMEEXCEPTION )
+{
+ return impl_getStaticImplementationName();
+}
+
+/* XServiceInfo */
+sal_Bool SAL_CALL bf_OfficeWrapper::supportsService( const UNOOUSTRING& sServiceName ) throw( UNORUNTIMEEXCEPTION )
+{
+ UNOSEQUENCE< UNOOUSTRING > seqServiceNames = getSupportedServiceNames();
+ const UNOOUSTRING* pArray = seqServiceNames.getConstArray();
+ for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ )
+ {
+ if ( pArray[nCounter] == sServiceName )
+ {
+ return sal_True ;
+ }
+ }
+ return sal_False ;
+}
+
+/* XServiceInfo */
+UNOSEQUENCE< UNOOUSTRING > SAL_CALL bf_OfficeWrapper::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION )
+{
+ return impl_getStaticSupportedServiceNames();
+}
+
+/* Helper for XServiceInfo */
+UNOSEQUENCE< UNOOUSTRING > bf_OfficeWrapper::impl_getStaticSupportedServiceNames()
+{
+ UNOMUTEXGUARD aGuard( UNOMUTEX::getGlobalMutex() );
+ UNOSEQUENCE< UNOOUSTRING > seqServiceNames( 1 );
+ seqServiceNames.getArray() [0] = UNOOUSTRING::createFromAscii( "com.sun.star.office.OfficeWrapper" );
+ return seqServiceNames ;
+}
+
+/* Helper for XServiceInfo */
+UNOOUSTRING bf_OfficeWrapper::impl_getStaticImplementationName()
+{
+ return UNOOUSTRING::createFromAscii( "com.sun.star.comp.desktop.OfficeWrapper" );
+}
Reference< XInterface > SAL_CALL bf_OfficeWrapper_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr )
{
diff --git a/binfilter/filter/source/bf_offwrp/bf_wrapper.hxx b/binfilter/filter/source/bf_offwrp/bf_wrapper.hxx
index 27e5803..ed37a81 100644
--- a/binfilter/filter/source/bf_offwrp/bf_wrapper.hxx
+++ b/binfilter/filter/source/bf_offwrp/bf_wrapper.hxx
@@ -69,7 +69,17 @@ public:
bf_OfficeWrapper( const Reference < XMultiServiceFactory >& xFactory );
virtual ~bf_OfficeWrapper();
- SFX_DECL_XSERVICEINFO
+ /* XServiceInfo */
+ virtual UNOOUSTRING SAL_CALL getImplementationName() throw( UNORUNTIMEEXCEPTION );
+ virtual sal_Bool SAL_CALL supportsService( const UNOOUSTRING& sServiceName ) throw( UNORUNTIMEEXCEPTION );
+ virtual UNOSEQUENCE< UNOOUSTRING > SAL_CALL getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION );
+
+ /* Helper for XServiceInfo */
+ static UNOSEQUENCE< UNOOUSTRING > impl_getStaticSupportedServiceNames();
+ static UNOOUSTRING impl_getStaticImplementationName();
+
+ /* Helper for registry */
+ static UNOREFERENCE< UNOXSINGLESERVICEFACTORY > impl_createFactory( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager );
static Reference< XSingleServiceFactory > GetWrapperFactory( Reference< XMultiServiceFactory > & xSMgr );
static ::rtl::OUString GetImplementationName_static();
diff --git a/binfilter/inc/bf_sw/viewsh.hxx b/binfilter/inc/bf_sw/viewsh.hxx
index 4a982ef..78c6a75 100644
--- a/binfilter/inc/bf_sw/viewsh.hxx
+++ b/binfilter/inc/bf_sw/viewsh.hxx
@@ -53,7 +53,6 @@ class SwDoc;
class SfxPrinter;
class SfxProgress;
-class SwRootFrm;
class SwNodes;
class SdrView;
@@ -119,11 +118,7 @@ class ViewShell : public Ring
//Drag der Scrollbars.
sal_Bool bEndActionByVirDev:1; //Paints aus der EndAction immer ueber virtuelles
- //Device (etwa beim Browsen)
-
- inline void ResetInvalidRect();
-
- // Malen der Wiese und rufen
+ // Malen der Wiese und rufen
// PaintDesktop gesplittet, dieser Teil wird auch von PreViewPage benutzt
sal_Bool CheckInvalidForPaint( const SwRect & );//Direkt Paint oder lieber
@@ -158,22 +153,12 @@ public:
inline sal_Bool HasInvalidRect() const { return aInvalidRect.HasArea(); }
void InvalidateWindows( const SwRect &rRect );
- sal_Bool IsPaintInProgress() const { return bPaintInProgress; }
-
- //Benachrichtung, dass sich der sichtbare Bereich geaendert hat.
- //VisArea wird neu gesetzt, anschliessend wird gescrollt.
- //Das uebergebene Rect liegt auf Pixelgrenzen,
- //um Pixelfehler beim Scrollen zu vermeiden.
- void EnableSmooth( sal_Bool b ) { bEnableSmooth = b; }
const SwRect &VisArea() const { return aVisArea; }
//Invalidierung der ersten Sichtbaren Seite fuer alle Shells im Ring.
void SetFirstVisPageInvalid();
- SwRootFrm *GetLayout() const { return NULL; }
- //erzeugt?
-
inline SwDoc *GetDoc() const { return pDoc; } //niemals 0.
// 1. GetPrt: The printer at the document
@@ -207,19 +192,10 @@ public:
void SetUseVirtualDevice(sal_Bool bSet);
inline const SwViewOption *GetViewOptions() const { return pOpt; }
- void ApplyViewOptions( const SwViewOption& /*rOpt*/ ){DBG_BF_ASSERT(0, "STRIP");} ;
//static void SetShellRes( ShellResource* pRes ) { pShellRes = pRes; }
static ShellResource* GetShellRes();
- static void SetCareWin( Window* pNew ) { pCareWindow = pNew; }
- static Window* GetCareWin(ViewShell& rVSh)
- { return pCareWindow ? pCareWindow : CareChildWin(rVSh); }
- static Window* CareChildWin(ViewShell& /*rVSh*/){DBG_BF_ASSERT(0, "STRIP"); return NULL;} ;
-
- inline SfxViewShell *GetSfxViewShell() { return pSfxViewShell; }
- inline void SetSfxViewShell(SfxViewShell *pNew) { pSfxViewShell = pNew; }
-
// Selektion der Draw ::com::sun::star::script::Engine geaendert
virtual void DrawSelChanged(SdrView*);
@@ -231,13 +207,6 @@ public:
SfxProgress& rProgress,
const SwPagePreViewPrtData* = 0 );
- // Prospekt-Format drucken
-
- sal_Bool IsViewLocked() const { return bViewLocked; }
- void LockView( sal_Bool b ) { bViewLocked = b; }
-
- sal_Bool IsPaintLocked() const { return nLockPaint != 0; }
-
// Abfragen/Erzeugen DrawView + PageView
sal_Bool HasDrawView() const;
@@ -245,10 +214,6 @@ public:
sal_Bool IsPreView() const { return bPreView; }
- sal_Bool IsFrameView() const { return bFrameView; }
- void SetFrameView( const Size& rBrowseBorder )
- { bFrameView = sal_True; aBrowseBorder = rBrowseBorder; }
-
//Damit in der UI nicht ueberall das dochxx includet werden muss
sal_Bool IsBrowseMode() const;
@@ -270,11 +235,6 @@ public:
~CurrShell();
};
-inline void ViewShell::ResetInvalidRect()
-{
- aInvalidRect.Clear();
-}
-
} //namespace binfilter
#endif //_VIEWSH_HXX
More information about the Libreoffice-commits
mailing list