summaryrefslogtreecommitdiff
path: root/sw/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui')
-rw-r--r--sw/source/ui/app/docsh.cxx4
-rw-r--r--sw/source/ui/app/mainwn.cxx2
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx4
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx6
-rw-r--r--sw/source/ui/dochdl/gloshdl.cxx2
-rw-r--r--sw/source/ui/dochdl/swdtflvr.cxx2
-rw-r--r--sw/source/ui/misc/glossary.cxx2
-rw-r--r--sw/source/ui/ribbar/makefile.mk1
-rw-r--r--sw/source/ui/uiview/srcview.cxx25
-rw-r--r--sw/source/ui/uno/swdet2.cxx12
10 files changed, 13 insertions, 47 deletions
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index 659ef01562d1..498c10133954 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -206,7 +206,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
return 0;
}
String aFileName( rMedium.GetName() );
- SwRead pRead = SwIoSystem::GetReader( pFlt->GetUserData() );
+ SwRead pRead = SwReaderWriter::GetReader( pFlt->GetUserData() );
if( !pRead )
return 0;
@@ -602,7 +602,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
return FALSE;
WriterRef xWriter;
- SwIoSystem::GetWriter( pFlt->GetUserData(), rMedium.GetBaseURL( true ), xWriter );
+ SwReaderWriter::GetWriter( pFlt->GetUserData(), rMedium.GetBaseURL( true ), xWriter );
if( !xWriter.Is() )
{ // Der Filter ist nicht vorhanden
InfoBox( 0,
diff --git a/sw/source/ui/app/mainwn.cxx b/sw/source/ui/app/mainwn.cxx
index dafe7bab08fd..815269e82044 100644
--- a/sw/source/ui/app/mainwn.cxx
+++ b/sw/source/ui/app/mainwn.cxx
@@ -33,7 +33,7 @@
-
+#include <mdiexp.hxx>
#include <tools/shl.hxx>
#include <tools/string.hxx>
#ifndef _SVARRAY_HXX
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index b831fc410396..44c2aeeb6220 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -72,12 +72,10 @@
#include <osl/file.hxx>
#include <unoprnms.hxx>
-
#include <mmlayoutpage.hrc>
#include <dbui.hrc>
#include <unomid.h>
-
using namespace osl;
using namespace svt;
using namespace ::com::sun::star;
@@ -132,7 +130,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat(
- String::CreateFromAscii( GetFILTER_XML() ),
+ String::CreateFromAscii( FILTER_XML ),
SwDocShell::Factory().GetFilterContainer() );
//save the current document into a temporary file
{
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 803ef93b9cdc..4a5884a9daeb 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -778,7 +778,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
INetURLObject(), utl::TempFile::CreateTempName(),
URIHelper::GetMaybeFileHdl());
const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat(
- String::CreateFromAscii( GetFILTER_XML() ),
+ String::CreateFromAscii( FILTER_XML ),
SwDocShell::Factory().GetFilterContainer() );
uno::Sequence< beans::PropertyValue > aValues(1);
@@ -1093,7 +1093,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
SfxFilterMatcher aMatcher( pFilterContainer->GetName() );
SfxFilterMatcherIter aIter( &aMatcher );
const SfxFilter* pFilter = aIter.First();
- String sFilterUserData( String::CreateFromAscii(GetFILTER_WW8()));
+ String sFilterUserData( String::CreateFromAscii( FILTER_WW8 ));
while ( pFilter )
{
if( pFilter->GetUserData() == sFilterUserData && pFilter->CanExport() )
@@ -1180,7 +1180,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
INetURLObject(), utl::TempFile::CreateTempName(),
URIHelper::GetMaybeFileHdl());
const SfxFilter *pTargetSfxFlt = SwIoSystem::GetFilterOfFormat(
- String::CreateFromAscii( GetFILTER_XML() ),
+ String::CreateFromAscii( FILTER_XML ),
SwDocShell::Factory().GetFilterContainer() );
uno::Sequence< beans::PropertyValue > aValues(1);
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index a8ee568b7520..c98b76476c10 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -920,7 +920,7 @@ BOOL SwGlossaryHdl::ImportGlossaries( const String& rName )
{
SwTextBlocks *pGlossary;
pMed->SetFilter( pFilter );
- Reader* pR = SwIoSystem::GetReader( pFilter->GetUserData() );
+ Reader* pR = SwReaderWriter::GetReader( pFilter->GetUserData() );
if( pR && 0 != ( pGlossary = pCurGrp ? pCurGrp
: rStatGlossaries.GetGroupDoc(aCurGrp)) )
{
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 301c5722a73c..d575b1bf6917 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -1704,7 +1704,7 @@ int SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
{
pStream = &xStrm;
if( SOT_FORMAT_RTF == nFmt )
- pRead = ReadRtf;
+ pRead = SwReaderWriter::GetReader( READER_WRITER_RTF );
else if( !pRead )
{
pRead = ReadHTML;
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 3d40ce80c918..3399ecb4e752 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -680,7 +680,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
SvtPathOptions aPathOpt;
xFP->setDisplayDirectory(aPathOpt.GetWorkPath() );
- String sWW8( C2S(GetFILTER_WW8()) );
+ String sWW8( C2S( FILTER_WW8 ) );
uno::Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY);
SfxFilterMatcher aMatcher( String::CreateFromAscii(SwDocShell::Factory().GetShortName()) );
diff --git a/sw/source/ui/ribbar/makefile.mk b/sw/source/ui/ribbar/makefile.mk
index 9c2f4bb79763..fa0b6a9488df 100644
--- a/sw/source/ui/ribbar/makefile.mk
+++ b/sw/source/ui/ribbar/makefile.mk
@@ -52,7 +52,6 @@ SRC1FILES = \
SLOFILES = \
$(SLO)$/inputwin.obj \
$(SLO)$/tbxanchr.obj \
- $(SLO)$/tbxmgr.obj \
$(SLO)$/conrect.obj \
$(SLO)$/conform.obj \
$(SLO)$/conpoly.obj \
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index ea42b91fd9b9..fe585e068aa4 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -71,43 +71,21 @@
#include <sfx2/sfxhtml.hxx>
#include <swtypes.hxx>
#include <swmodule.hxx>
-#ifndef _DOCSH_HXX
#include <docsh.hxx>
-#endif
-#ifndef _WDOCSH_HXX
#include <wdocsh.hxx>
-#endif
-#ifndef _SRCVIEW_HXX
#include <srcview.hxx>
-#endif
#include <viewfunc.hxx>
#include <doc.hxx>
-#ifndef _ITEMDEF_HXX
#include <itemdef.hxx>
-#endif
#include <shellio.hxx>
-#ifndef _CMDID_H
#include <cmdid.h> // FN_ ...
-#endif
-#ifndef _HELPID_H
#include <helpid.h>
-#endif
-#ifndef _GLOBALS_HRC
#include <globals.hrc>
-#endif
-#ifndef _SHELLS_HRC
#include <shells.hrc>
-#endif
-#ifndef _POPUP_HRC
#include <popup.hrc>
-#endif
-#ifndef _WEB_HRC
#include <web.hrc>
-#endif
-#ifndef _VIEW_HRC
#include <view.hrc>
-#endif
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <sfx2/filedlghelper.hxx>
@@ -130,8 +108,9 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::lang;
-using ::rtl::OUString;
using namespace ::sfx2;
+using ::rtl::OUString;
+using ::com::sun::star::util::SearchOptions;
#define SWSRCVIEWFLAGS ( SFX_VIEW_MAXIMIZE_FIRST| \
diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx
index ed7f3d5d6298..aedd6e0f6c68 100644
--- a/sw/source/ui/uno/swdet2.cxx
+++ b/sw/source/ui/uno/swdet2.cxx
@@ -38,17 +38,12 @@
#include <sfx2/docfile.hxx>
#include <sfx2/app.hxx>
#include <svtools/sfxecode.hxx>
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
#include <svtools/parhtml.hxx>
#include <sot/clsids.hxx>
-#include <shellio.hxx>
-
-#undef _DLL_
+#include <iodetect.hxx>
#include <swdetect.hxx>
-#include "iodetect.cxx"
#include <app.hrc>
#include <web.hrc>
@@ -58,16 +53,11 @@
#include <unomid.h>
-
-USHORT AutoDetec( const String& FileName, USHORT & rVersion );
-
bool IsDocShellRegistered()
{
return SvtModuleOptions().IsWriter();
}
-extern const char __FAR_DATA sHTML[];
-
//-------------------------------------------------------------------------
ULONG SwFilterDetect::DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter )
generated by cgit (git 2.34.1) at 2024-07-09 20:26:16 +0000