summaryrefslogtreecommitdiff
path: root/sfx2/source/doc
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/doc')
-rw-r--r--sfx2/source/doc/SfxDocumentMetaData.cxx9
-rw-r--r--sfx2/source/doc/docfile.cxx42
-rw-r--r--sfx2/source/doc/docinsert.cxx4
-rw-r--r--sfx2/source/doc/doctempl.cxx2
-rw-r--r--sfx2/source/doc/docundomanager.cxx1
-rw-r--r--sfx2/source/doc/iframe.cxx5
-rw-r--r--sfx2/source/doc/new.cxx1
-rw-r--r--sfx2/source/doc/objserv.cxx19
-rw-r--r--sfx2/source/doc/objstor.cxx3
-rw-r--r--sfx2/source/doc/oleprops.cxx7
-rw-r--r--sfx2/source/doc/syspath.cxx2
11 files changed, 8 insertions, 87 deletions
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index a94ec74297ee..225648176405 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -17,8 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <sal/config.h>
+
+#include <boost/noncopyable.hpp>
#include <cppuhelper/compbase6.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
@@ -126,7 +127,8 @@ typedef ::cppu::WeakComponentImplHelper6<
class SfxDocumentMetaData:
private ::cppu::BaseMutex,
- public SfxDocumentMetaData_Base
+ public SfxDocumentMetaData_Base,
+ private boost::noncopyable
{
public:
explicit SfxDocumentMetaData(
@@ -286,9 +288,6 @@ public:
throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
protected:
- SfxDocumentMetaData(SfxDocumentMetaData &); // not defined
- SfxDocumentMetaData& operator =(SfxDocumentMetaData &); // not defined
-
virtual ~SfxDocumentMetaData() {}
virtual SfxDocumentMetaData* createMe( css::uno::Reference< css::uno::XComponentContext > const & context ) { return new SfxDocumentMetaData( context ); };
const css::uno::Reference< css::uno::XComponentContext > m_xContext;
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index dbe72e1b1241..a4c0c72bc811 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -164,48 +164,6 @@ bool IsLockingUsed()
} // anonymous namespace
-
-
-
-class SfxMediumHandler_Impl : public ::cppu::WeakImplHelper1< com::sun::star::task::XInteractionHandler >
-{
- com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > m_xInter;
-
-public:
- virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& xRequest )
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-
- SfxMediumHandler_Impl( com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > xInteraction )
- : m_xInter( xInteraction )
- {}
-
- virtual ~SfxMediumHandler_Impl();
-};
-
-
-SfxMediumHandler_Impl::~SfxMediumHandler_Impl()
-{
-}
-
-
-void SAL_CALL SfxMediumHandler_Impl::handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& xRequest )
- throw( com::sun::star::uno::RuntimeException, std::exception )
-{
- if( !m_xInter.is() )
- return;
-
- com::sun::star::uno::Any aRequest = xRequest->getRequest();
- com::sun::star::ucb::InteractiveIOException aIoException;
- com::sun::star::ucb::UnsupportedDataSinkException aSinkException;
- if ( (aRequest >>= aIoException) && ( aIoException.Code == IOErrorCode_ACCESS_DENIED || aIoException.Code == IOErrorCode_LOCKING_VIOLATION ) )
- return;
- else
- if ( aRequest >>= aSinkException )
- return;
- else
- m_xInter->handle( xRequest );
-}
-
class SfxMedium_Impl : boost::noncopyable
{
public:
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index fec9241989fe..ce2b0c22ebba 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -22,6 +22,7 @@
#include <sfx2/docfile.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/filedlghelper.hxx>
+#include "appopen.hxx"
#include "openflag.hxx"
#include <sfx2/passwd.hxx>
@@ -44,9 +45,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::uno;
-// implemented in 'sfx2/source/appl/appopen.cxx'
-extern sal_uInt32 CheckPasswd_Impl( SfxObjectShell* pDoc, SfxItemPool &rPool, SfxMedium* pFile );
-
namespace sfx2 {
DocumentInserter::DocumentInserter(
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index fc563c5be123..22d536deaed8 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -184,8 +184,6 @@ public:
size_t *pPos = NULL );
void DeleteEntry( size_t nIndex );
- int Compare( const OUString& rTitle ) const
- { return maTitle.compareTo( rTitle ); }
int Compare( RegionData_Impl* pCompareWith ) const;
};
diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx
index d71f019c2b82..5ab013c157c4 100644
--- a/sfx2/source/doc/docundomanager.cxx
+++ b/sfx2/source/doc/docundomanager.cxx
@@ -93,7 +93,6 @@ namespace sfx2
{
};
- const SfxObjectShell* getObjectShell() const { return rAntiImpl.getBaseModel().GetObjectShell(); }
SfxObjectShell* getObjectShell() { return rAntiImpl.getBaseModel().GetObjectShell(); }
// IUndoManagerImplementation
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 16da605f2d63..c0631e0e8bb5 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -108,20 +108,15 @@ public:
class IFrameWindow_Impl : public Window
{
uno::Reference < frame::XFrame2 > mxFrame;
- bool bBorder;
public:
IFrameWindow_Impl( Window *pParent,
bool bHasBorder,
WinBits nWinBits = 0 );
-
-public:
- bool HasBorder() const { return bBorder; }
};
IFrameWindow_Impl::IFrameWindow_Impl( Window *pParent, bool bHasBorder, WinBits nWinBits )
: Window( pParent, nWinBits | WB_CLIPCHILDREN | WB_NODIALOGCONTROL | WB_DOCKBORDER )
- , bBorder(bHasBorder)
{
if ( !bHasBorder )
SetBorderStyle( WINDOW_BORDER_NOBORDER );
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 04b1200abab6..77680ff2c5f6 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -149,7 +149,6 @@ class SfxNewFileDialog_Impl
DECL_LINK( RegionSelect, ListBox * );
DECL_LINK(TemplateSelect, void *);
DECL_LINK( DoubleClick, ListBox * );
- void TogglePreview(CheckBox *);
DECL_LINK( Expand, void * );
DECL_LINK(LoadFile, void *);
sal_uInt16 GetSelectedTemplatePos() const;
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 7cf4d1244d18..87dc8ebcfbb7 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -110,25 +110,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::task;
-
-
-class SfxSaveAsContext_Impl
-{
- OUString& _rNewNameVar;
- OUString _aNewName;
-
-public:
- SfxSaveAsContext_Impl( OUString &rNewNameVar,
- const OUString &rNewName )
- : _rNewNameVar( rNewNameVar ),
- _aNewName( rNewName )
- { rNewNameVar = rNewName; }
- ~SfxSaveAsContext_Impl()
- { _rNewNameVar = ""; }
-};
-
-
-
#define SfxObjectShell
#include "sfxslots.hxx"
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index d33f8369ec29..7aeb70d53169 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -112,6 +112,7 @@
#include <sfx2/fcontnr.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/docfac.hxx>
+#include "appopen.hxx"
#include "objshimp.hxx"
#include "sfxtypes.hxx"
#include "doc.hrc"
@@ -129,8 +130,6 @@
#include "../appl/app.hrc"
-extern sal_uInt32 CheckPasswd_Impl( SfxObjectShell*, SfxItemPool&, SfxMedium* );
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index 459b48495838..a6c6a247650d 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -75,7 +75,6 @@ public:
explicit SfxOleInt32Property( sal_Int32 nPropId, sal_Int32 nValue = 0 );
inline sal_Int32 GetValue() const { return mnValue; }
- inline void SetValue( sal_Int32 nValue ) { mnValue = nValue; }
private:
virtual void ImplLoad( SvStream& rStrm ) SAL_OVERRIDE;
@@ -94,7 +93,6 @@ public:
explicit SfxOleDoubleProperty( sal_Int32 nPropId, double fValue = 0.0 );
inline double GetValue() const { return mfValue; }
- inline void SetValue( double fValue ) { mfValue = fValue; }
private:
virtual void ImplLoad( SvStream& rStrm ) SAL_OVERRIDE;
@@ -113,7 +111,6 @@ public:
explicit SfxOleBoolProperty( sal_Int32 nPropId, bool bValue = false );
inline bool GetValue() const { return mbValue; }
- inline void SetValue( bool bValue ) { mbValue = bValue; }
private:
virtual void ImplLoad( SvStream& rStrm ) SAL_OVERRIDE;
@@ -188,8 +185,6 @@ public:
/** Returns the time value as LOCAL time. */
inline const util::DateTime& GetValue() const { return maDateTime; }
- /** @param rDateTime Date and time as LOCAL time. */
- inline void SetValue( const util::DateTime& rDateTime ) { maDateTime = rDateTime; }
private:
virtual void ImplLoad( SvStream& rStrm ) SAL_OVERRIDE;
@@ -207,8 +202,6 @@ public:
/** Returns the date value as LOCAL time. */
inline const util::Date& GetValue() const { return maDate; }
- /** @param rDate Date as LOCAL time. */
- inline void SetValue( const util::Date& rDate ) { maDate = rDate; }
private:
virtual void ImplLoad( SvStream& rStrm ) SAL_OVERRIDE;
diff --git a/sfx2/source/doc/syspath.cxx b/sfx2/source/doc/syspath.cxx
index 612dc3ab5628..456b97ad6ec9 100644
--- a/sfx2/source/doc/syspath.cxx
+++ b/sfx2/source/doc/syspath.cxx
@@ -19,7 +19,9 @@
#include "syspath.hxx"
+#if defined WNT
extern "C" bool GetUserTemplateLocation(sal_Unicode*, int nSize);
+#endif
bool SystemPath::GetUserTemplateLocation(sal_Unicode* pFolder, int nSize )
{
generated by cgit (git 2.34.1) at 2024-07-10 17:41:56 +0000