summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sfx2/source/appl/app.cxx10
-rw-r--r--sfx2/source/appl/appdata.cxx5
-rw-r--r--sfx2/source/appl/appinit.cxx5
-rw-r--r--sfx2/source/appl/appquit.cxx5
-rw-r--r--sfx2/source/appl/appuno.cxx5
-rw-r--r--sfx2/source/appl/newhelp.cxx9
-rw-r--r--sfx2/source/bastyp/fltfnc.cxx5
-rw-r--r--sfx2/source/doc/objmisc.cxx15
-rw-r--r--sfx2/source/explorer/makefile.mk8
-rw-r--r--sfx2/source/inet/inettbc.cxx5
-rw-r--r--sfx2/source/view/viewfrm.cxx19
11 files changed, 29 insertions, 62 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index c8f6464efc4a..167b65884667 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: app.cxx,v $
*
- * $Revision: 1.55 $
+ * $Revision: 1.56 $
*
- * last change: $Author: mba $ $Date: 2001-09-04 10:29:42 $
+ * last change: $Author: mba $ $Date: 2001-09-10 16:37:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -116,7 +116,6 @@
#include <svtools/ehdl.hxx>
#endif
-#include "ucbhelp.hxx" // just for Init/DeInit
#include <svtools/svdde.hxx>
#include <tools/urlobj.hxx>
#include <unotools/tempfile.hxx>
@@ -485,6 +484,7 @@ SfxApplication::SfxApplication()
RTL_LOGFILE_CONTEXT_TRACE( aLog, "} precreate svtools options objects" );
#endif
+/*
#if SUPD>637
RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ UCB_Helper::Initialize" );
#endif
@@ -492,7 +492,7 @@ SfxApplication::SfxApplication()
#if SUPD>637
RTL_LOGFILE_CONTEXT_TRACE( aLog, "} UCB_Helper::Initialize" );
#endif
-
+*/
pImp = new SfxApplication_Impl;
pImp->bConfigLoaded = sal_False;
pImp->pEmptyMenu = 0;
@@ -592,7 +592,7 @@ SfxApplication::~SfxApplication()
Broadcast( SfxSimpleHint(SFX_HINT_DYING) );
SfxObjectFactory::RemoveAll_Impl();
- UCB_Helper::Deinitialize();
+// UCB_Helper::Deinitialize();
delete pCfgMgr;
delete pImp;
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 03b81ebb178c..f070cf5bf741 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: appdata.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: mba $ $Date: 2001-09-06 07:44:08 $
+ * last change: $Author: mba $ $Date: 2001-09-10 16:37:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -110,7 +110,6 @@
#include "app.hrc"
#include "sfxresid.hxx"
#include "objshimp.hxx"
-#include "ucbhelp.hxx"
#include "appuno.hxx"
SfxAppData_Impl::SfxAppData_Impl( SfxApplication* pApp ) :
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 22707ca5b4c6..14eb42077738 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: appinit.cxx,v $
*
- * $Revision: 1.25 $
+ * $Revision: 1.26 $
*
- * last change: $Author: cd $ $Date: 2001-08-16 15:09:41 $
+ * last change: $Author: mba $ $Date: 2001-09-10 16:37:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -173,7 +173,6 @@
#include "viewsh.hxx"
#include "eacopier.hxx"
#include "nochaos.hxx"
-#include "ucbhelp.hxx"
#include "fcontnr.hxx"
#include "helper.hxx" // SfxContentHelper::Kill()
#include "sfxpicklist.hxx"
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index c761dfa645d4..10bf921a8700 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: appquit.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: mba $ $Date: 2001-09-04 10:29:05 $
+ * last change: $Author: mba $ $Date: 2001-09-10 16:37:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -115,7 +115,6 @@
#include "dataurl.hxx"
#include "fcontnr.hxx"
#include "nochaos.hxx"
-#include "ucbhelp.hxx"
#include "appuno.hxx"
#include "doctempl.hxx"
#include "viewfrm.hxx"
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index f70d6715560e..fbc34b34900d 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: appuno.cxx,v $
*
- * $Revision: 1.30 $
+ * $Revision: 1.31 $
*
- * last change: $Author: mba $ $Date: 2001-09-06 08:59:39 $
+ * last change: $Author: mba $ $Date: 2001-09-10 16:37:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -190,7 +190,6 @@ using namespace ::rtl;
#include "msgpool.hxx"
#include "request.hxx"
#include "module.hxx"
-#include "ucbhelp.hxx"
#include "fcontnr.hxx"
#include "frmload.hxx"
#include "frame.hxx"
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 8e454aa3e6d4..3c6f0bdad625 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: newhelp.cxx,v $
*
- * $Revision: 1.43 $
+ * $Revision: 1.44 $
*
- * last change: $Author: gt $ $Date: 2001-09-10 14:09:36 $
+ * last change: $Author: mba $ $Date: 2001-09-10 16:37:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -66,7 +66,6 @@
#include "helper.hxx"
#include "msgpool.hxx"
#include "app.hxx"
-#include "ucbhelp.hxx"
#include "sfxtypes.hxx"
#include "app.hrc"
@@ -142,7 +141,7 @@
#endif
#include <ucbhelper/content.hxx>
#include <vcl/msgbox.hxx>
-#include <svtools/cntwids.hrc> // WID_TARGET_URL
+#include <unotools/ucbhelper.hxx>
using namespace ::ucb;
using namespace ::com::sun::star::beans;
@@ -354,7 +353,7 @@ void ContentListBox_Impl::RequestingChilds( SvLBoxEntry* pParent )
else
{
pEntry = InsertEntry( aTitle, aDocumentImage, aDocumentImage, pParent );
- Any aAny( UCB_Helper::GetProperty( aURL, WID_TARGET_URL ) );
+ Any aAny( ::utl::UCBContentHelper::GetProperty( aURL, String(RTL_CONSTASCII_USTRINGPARAM("TargetURL" ) ) ) );
rtl::OUString aTargetURL;
if ( aAny >>= aTargetURL )
pEntry->SetUserData( new ContentEntry_Impl( aTargetURL, sal_False ) );
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index aeedcc1289e9..048b4d5a453f 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fltfnc.cxx,v $
*
- * $Revision: 1.39 $
+ * $Revision: 1.40 $
*
- * last change: $Author: mba $ $Date: 2001-09-04 10:30:50 $
+ * last change: $Author: mba $ $Date: 2001-09-10 16:37:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -286,7 +286,6 @@ using namespace ::vos;
#include "appdata.hxx"
#include "appuno.hxx"
#include "viewfrm.hxx"
-#include "ucbhelp.hxx"
#define SFX_STR_OVERRIDE "Override"
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 8c7ff881fc95..8132af636fff 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: objmisc.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: fs $ $Date: 2001-08-27 16:51:29 $
+ * last change: $Author: mba $ $Date: 2001-09-10 16:37:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -141,6 +141,7 @@ using namespace ::com::sun::star::ucb;
#endif
#include <svtools/pathoptions.hxx>
+#include <unotools/ucbhelper.hxx>
#include "appdata.hxx"
#include "request.hxx"
@@ -163,10 +164,6 @@ using namespace ::com::sun::star::ucb;
#include "module.hxx"
#include "macrconf.hxx"
#include "docfac.hxx"
-#if SUPD<613//MUSTINI
-#include "inimgr.hxx"
-#endif
-#include "ucbhelp.hxx"
#include "helper.hxx"
// class SfxHeaderAttributes_Impl ----------------------------------------
@@ -1465,15 +1462,11 @@ sal_Bool SfxObjectShell::IsSecure()
}
INetURLObject aURL( "macro:" );
-#if SUPD<613//MUSTINI
- if ( SFX_APP()->IsSecureURL( aURL, &aReferer ) )
-#else
if ( SvtSecurityOptions().IsSecureURL( aURL.GetMainURL(), aReferer ) )
-#endif
{
if ( GetMedium()->GetContent().is() )
{
- Any aAny( UCB_Helper::GetProperty( GetMedium()->GetContent(), WID_IS_PROTECTED ) );
+ Any aAny( ::utl::UCBContentHelper::GetProperty( aURL.GetMainURL(), String( RTL_CONSTASCII_USTRINGPARAM("IsProtected")) ) );
sal_Bool bIsProtected = FALSE;
if ( ( aAny >>= bIsProtected ) && bIsProtected )
return sal_False;
diff --git a/sfx2/source/explorer/makefile.mk b/sfx2/source/explorer/makefile.mk
index be88a43cdf8f..0e16a143ba2f 100644
--- a/sfx2/source/explorer/makefile.mk
+++ b/sfx2/source/explorer/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.6 $
+# $Revision: 1.7 $
#
-# last change: $Author: dv $ $Date: 2001-07-09 15:32:57 $
+# last change: $Author: mba $ $Date: 2001-09-10 16:37:27 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -77,7 +77,6 @@ AUTOSEG=true
# --- Files --------------------------------------------------------
SLOFILES = \
- $(SLO)$/ucbhelp.obj \
$(SLO)$/nochaos.obj \
$(SLO)$/exptypes.obj \
$(SLO)$/infodlgs.obj \
@@ -88,9 +87,6 @@ CXXFILES += goffline.cxx
SLOFILES += $(SLO)$/goffline.obj
.ENDIF
-EXCEPTIONSFILES = \
- $(SLO)$/ucbhelp.obj
-
SRCFILES = \
explorer.src
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 32ddd6a7a0c4..39007b441751 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: inettbc.cxx,v $
*
- * $Revision: 1.19 $
+ * $Revision: 1.20 $
*
- * last change: $Author: dv $ $Date: 2001-07-10 15:14:24 $
+ * last change: $Author: mba $ $Date: 2001-09-10 16:37:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -99,7 +99,6 @@
#include "referers.hxx"
#include "sfxtypes.hxx"
#include "helper.hxx"
-#include "ucbhelp.hxx"
//***************************************************************************
// SfxURLToolBoxControl_Impl
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index f45da9a27db4..45fa2af4eae2 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: viewfrm.cxx,v $
*
- * $Revision: 1.34 $
+ * $Revision: 1.35 $
*
- * last change: $Author: pb $ $Date: 2001-09-06 10:15:54 $
+ * last change: $Author: mba $ $Date: 2001-09-10 16:37:28 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -175,7 +175,6 @@ using namespace ::com::sun::star::frame;
#include <frmdescr.hxx>
#include "appdata.hxx"
#include "sfxuno.hxx"
-#include "ucbhelp.hxx"
#include "progress.hxx"
#include "workwin.hxx"
#include "helper.hxx"
@@ -2275,20 +2274,6 @@ void SfxViewFrame::Show()
else
UpdateTitle();
- // Anchor auf gelesen setzen
- Reference < XContent > xContent( GetObjectShell()->GetMedium()->GetContent() );
- if ( xContent.is() )
- {
- Any aAny( UCB_Helper::GetProperty( xContent, WID_FLAG_IS_FOLDER ) );
- sal_Bool bIsFolder = FALSE;
- if ( !( aAny >>= bIsFolder ) || !bIsFolder )
- {
- Any aSet;
- aSet <<= sal_True;
- UCB_Helper::SetProperty( xContent, WID_IS_READ, aSet );
- }
- }
-
// Frame-Window anzeigen, aber nur wenn der ViewFrame kein eigenes Window
// hat oder wenn er keine Component enth"alt
if ( &GetWindow() == &GetFrame()->GetWindow() || !GetFrame()->HasComponent() )
generated by cgit (git 2.34.1) at 2024-07-28 23:50:49 +0000