[Libreoffice-commits] .: 5 commits - binfilter/bf_basic binfilter/bf_goodies binfilter/bf_sc binfilter/bf_svx binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Sep 29 01:35:46 PDT 2011
binfilter/bf_basic/source/sbx/sbxscan.cxx | 12 +-
binfilter/bf_goodies/source/base3d/goodies_b3dtrans.cxx | 4
binfilter/bf_sc/source/ui/app/sc_sclib.cxx | 3
binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx | 11 --
binfilter/bf_svx/source/xml/svx_xmlxtimp.cxx | 4
binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx | 25 ++---
binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx | 1
binfilter/bf_sw/source/ui/app/sw_swcomlib.cxx | 13 --
binfilter/inc/bf_goodies/b3dtrans.hxx | 6 -
binfilter/inc/bf_sw/iodetect.hxx | 80 ++--------------
binfilter/inc/bf_sw/shellio.hxx | 1
11 files changed, 39 insertions(+), 121 deletions(-)
New commits:
commit c6a8c64cfedc1a062060fb604aea0b60b2cd9238
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 29 09:10:54 2011 +0100
WaE: various windows warnings
diff --git a/binfilter/bf_goodies/source/base3d/goodies_b3dtrans.cxx b/binfilter/bf_goodies/source/base3d/goodies_b3dtrans.cxx
index f2b468b..26e94d1 100644
--- a/binfilter/bf_goodies/source/base3d/goodies_b3dtrans.cxx
+++ b/binfilter/bf_goodies/source/base3d/goodies_b3dtrans.cxx
@@ -109,11 +109,7 @@ void B3dTransformationSet::PostSetObjectTrans()
|*
\************************************************************************/
-#if ! defined ICC && ! defined __GNUC__
-void B3dTransformationSet::SetOrientation( Vector3D& aVRP, Vector3D& aVPN, Vector3D& aVUP)
-#else
void B3dTransformationSet::SetOrientation( Vector3D aVRP, Vector3D aVPN, Vector3D aVUP)
-#endif
{
aOrientation.Identity();
aOrientation.Orientation(Point4D(aVRP), aVPN, aVUP);
diff --git a/binfilter/bf_svx/source/xml/svx_xmlxtimp.cxx b/binfilter/bf_svx/source/xml/svx_xmlxtimp.cxx
index e4708d8..bab341f 100644
--- a/binfilter/bf_svx/source/xml/svx_xmlxtimp.cxx
+++ b/binfilter/bf_svx/source/xml/svx_xmlxtimp.cxx
@@ -154,7 +154,7 @@ private:
/*N*/ }
/*N*/ }
/*N*/ }
-/*N*/ catch( uno::Exception& e )
+/*N*/ catch (const uno::Exception&)
/*N*/ {
/*N*/ }
/*N*/ }
@@ -313,7 +313,7 @@ private:
/*N*/ if( pGraphicHelper )
/*N*/ SvXMLGraphicHelper::Destroy( pGraphicHelper );
/*N*/ }
-/*N*/ catch( uno::Exception& e )
+/*N*/ catch (const uno::Exception&)
/*N*/ {
/*N*/ bRet = sal_False;
/*N*/ }
diff --git a/binfilter/inc/bf_goodies/b3dtrans.hxx b/binfilter/inc/bf_goodies/b3dtrans.hxx
index 4c157a3..9fec7e2 100644
--- a/binfilter/inc/bf_goodies/b3dtrans.hxx
+++ b/binfilter/inc/bf_goodies/b3dtrans.hxx
@@ -153,15 +153,9 @@ public:
const Matrix4D& GetInvObjectTrans() { return aInvObjectTrans; }
// Orientation
-#if ! defined ICC && ! defined __GNUC__
- void SetOrientation(Vector3D& aVRP = Vector3D(0.0,0.0,1.0),
- Vector3D& aVPN = Vector3D(0.0,0.0,1.0),
- Vector3D& aVUP = Vector3D(0.0,1.0,0.0));
-#else
void SetOrientation(Vector3D aVRP = Vector3D(0.0,0.0,1.0),
Vector3D aVPN = Vector3D(0.0,0.0,1.0),
Vector3D aVUP = Vector3D(0.0,1.0,0.0));
-#endif
const Matrix4D& GetOrientation() { return aOrientation; }
const Matrix4D& GetInvOrientation() { return aInvOrientation; }
commit 48fb6d55281fb5d4054832987495967f55acdef4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 28 23:16:32 2011 +0100
ByteString->rtl::OStringBuffer
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
index f175981..171539a 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
@@ -55,6 +55,7 @@
#include <bf_sch/memchrt.hxx>
#include <bf_svtools/zformat.hxx>
#include <rtl/uuid.h>
+#include <rtl/strbuf.hxx>
#include <float.h> // DBL_MIN
#include <com/sun/star/awt/XBitmap.hpp>
@@ -108,9 +109,7 @@
#include "rangeseq.hxx"
#include "unowids.hxx"
-#ifndef __SGI_STL_LIST
#include <list>
-#endif
namespace binfilter {
@@ -783,11 +782,9 @@ void lcl_TestMap( const SfxItemPropertyMap* pMap )
int nDiff = strcmp( pMap->pName, pNext->pName );
if ( nDiff >= 0 )
{
- ByteString aErr("Reihenfolge: ");
- aErr += pMap->pName;
- aErr += '/';
- aErr += pNext->pName;
- OSL_FAIL( aErr.GetBuffer() );
+ rtl::OStringBuffer aErr("Reihenfolge: ");
+ aErr.append(pMap->pName).append('/').append(pNext->pName);
+ OSL_FAIL(aErr.getStr());
}
}
pMap = pNext;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
index 60681a0..d25118a 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
@@ -278,6 +278,7 @@ sal_Unicode Sw3IoImp::ConvStarMathCharToStarSymbol( sal_Char c )
/*N*/ const SvxFontItem& rFontItem,
/*N*/ SwInsHardBlankSoftHyph* pHBSH, BOOL bTo8 )
/*N*/ {
+/*N*/ rtl::OStringBuffer aText8(rText8);
/*N*/ sal_Bool bRet = sal_False;
/*N*/ const SwpHints *pHints = rNd.GetpSwpHints();
/*N*/ if( bTo8 )
@@ -308,9 +309,9 @@ sal_Unicode Sw3IoImp::ConvStarMathCharToStarSymbol( sal_Char c )
/*N*/ break;
/*N*/ }
/*N*/ if( bToBats )
-/*N*/ rText8 += ConvStarSymbolCharToStarBats( c );
+/*N*/ aText8.append(ConvStarSymbolCharToStarBats(c));
/*N*/ else
-/*N*/ rText8 += (sal_Char)c;
+/*N*/ aText8.append(static_cast<sal_Char>(c));
/*N*/ }
/*N*/ }
/*N*/ else
@@ -340,14 +341,15 @@ sal_Unicode Sw3IoImp::ConvStarMathCharToStarSymbol( sal_Char c )
/*N*/ if( bToFF )
/*N*/ {
/*N*/ if( nCopy < nPos )
-/*N*/ rText8 += ByteString( rText.Copy(nCopy,nPos-nCopy),
-/*N*/ eEnc );
-/*N*/ rText8 += '\xff';
+/*N*/ aText8.append(rtl::OUStringToOString(
+ rText.Copy(nCopy,nPos-nCopy), eEnc));
+/*N*/ aText8.append('\xff');
/*N*/ nCopy = nPos + 1;
/*N*/ }
/*N*/ }
/*N*/ if( nCopy < nEnd )
-/*N*/ rText8 += ByteString( rText.Copy(nCopy,nEnd-nCopy), eEnc );
+/*N*/ aText8.append(rtl::OUStringToOString(
+ rText.Copy(nCopy,nEnd-nCopy), eEnc));
/*N*/ }
/*N*/ }
/*N*/ else
@@ -362,7 +364,7 @@ sal_Unicode Sw3IoImp::ConvStarMathCharToStarSymbol( sal_Char c )
/*N*/ bRet = bBatsToSymbol || bMathToSymbol;
/*N*/ for( xub_StrLen nPos = nStart; nPos < nEnd; nPos++ )
/*N*/ {
-/*N*/ sal_Char c = rText8.GetChar( nPos );
+/*N*/ sal_Char c = aText8[nPos];
/*N*/ if( '\xff' == c && 0 != (pTAttr =
/*N*/ lcl_sw3io_hasTxtAttr( pHints, nPos+nOffset )) )
/*N*/ rText += GetCharOfTxtAttr( *pTAttr );
@@ -380,7 +382,7 @@ sal_Unicode Sw3IoImp::ConvStarMathCharToStarSymbol( sal_Char c )
/*N*/ xub_StrLen nCopy = nStart;
/*N*/ for( xub_StrLen nPos = nStart; nPos < nEnd; nPos++ )
/*N*/ {
-/*N*/ sal_Char c = rText8.GetChar( nPos );
+/*N*/ sal_Char c = aText8[nPos];
/*N*/ sal_Unicode cNew(0);
/*N*/ if( '\xff' == c )
/*N*/ {
@@ -391,7 +393,7 @@ sal_Unicode Sw3IoImp::ConvStarMathCharToStarSymbol( sal_Char c )
/*N*/ CHAR_HARDHYPHEN == cNew || CHAR_SOFTHYPHEN == cNew )
/*N*/ {
/*N*/ if( nCopy < nPos )
-/*N*/ rText += String( rText8.Copy(nCopy,nPos-nCopy), eEnc );
+/*N*/ rText += String(aText8.getStr()+nCopy,nPos-nCopy, eEnc);
/*N*/ if( pTAttr )
/*N*/ rText += GetCharOfTxtAttr( *pTAttr );
/*N*/ else
@@ -415,16 +417,17 @@ sal_Unicode Sw3IoImp::ConvStarMathCharToStarSymbol( sal_Char c )
/*N*/ CHAR_SOFTHYPHEN == ByteString_ConvertToUnicode( c, eEnc ) )
/*N*/ {
/*N*/ if( nCopy < nPos )
-/*N*/ rText += String( rText8.Copy(nCopy,nPos-nCopy), eEnc );
+/*N*/ rText += String(aText8.getStr()+nCopy,nPos-nCopy, eEnc);
/*N*/ rText += '-';
/*N*/ nCopy = nPos + 1;
/*N*/ }
/*N*/ }
/*N*/ }
/*N*/ if( nCopy < nEnd )
-/*N*/ rText += String( rText8.Copy( nCopy, nEnd-nCopy ), eEnc );
+/*N*/ rText += String(aText8.getStr()+nCopy, nEnd-nCopy, eEnc);
/*N*/ }
/*N*/ }
+/*N*/ rText8 = aText8.makeStringAndClear();
/*N*/ return bRet;
/*N*/ }
commit 5afb49253d21b6d11b106dd467f3e101371002d4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 28 23:01:35 2011 +0100
object is unused
diff --git a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
index d53c5c5..42a08da 100644
--- a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
+++ b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
@@ -567,14 +567,11 @@ SfxModule* ScModuleDummy::Load()
/*N*/
/*N*/ rStr.Seek( 0 );
/*N*/ const int nTrySize = 80;
-/*N*/ ByteString aHeader;
/*N*/ for ( int j = 0; j < nTrySize && !rStr.IsEof(); j++ )
/*N*/ {
/*N*/ sal_Char c;
/*N*/ rStr >> c;
-/*N*/ aHeader += c;
/*N*/ }
-/*N*/ aHeader += '\0';
// test for HTML
commit fcd2cd121d87327710697ace46b4b3b3ebab2d35
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 28 22:44:55 2011 +0100
mirror changes in here
diff --git a/binfilter/bf_basic/source/sbx/sbxscan.cxx b/binfilter/bf_basic/source/sbx/sbxscan.cxx
index 1962aa5..916b216 100644
--- a/binfilter/bf_basic/source/sbx/sbxscan.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxscan.cxx
@@ -36,6 +36,7 @@
#include <stdlib.h>
#endif
+#include <rtl/strbuf.hxx>
#include <vcl/svapp.hxx>
#include <math.h>
#include <string.h>
@@ -109,14 +110,15 @@ SbxError ImpScan( const XubString& rWSrc, double& nVal, SbxDataType& rType,
short comma = 0; // >0: Nachkomma
short ndig = 0; // Anzahl Ziffern
short ncdig = 0; // Anzahl Ziffern nach Komma
- ByteString aSearchStr( "0123456789DEde" );
+ rtl::OStringBuffer aSearchStr(RTL_CONSTASCII_STRINGPARAM(
+ "0123456789DEde"));
// Kommas ergaenzen
- aSearchStr += cNonIntntlComma;
+ aSearchStr.append(cNonIntntlComma);
if( cIntntlComma != cNonIntntlComma )
- aSearchStr += cIntntlComma;
+ aSearchStr.append(cIntntlComma);
if( bOnlyIntntl )
- aSearchStr += cIntntl1000;
- const char* pSearchStr = aSearchStr.GetBuffer();
+ aSearchStr.append(cIntntl1000);
+ const char* pSearchStr = aSearchStr.getStr();
while( strchr( pSearchStr, *p ) && *p )
{
// 1000er-Trenner ueberlesen
commit a6deb105bd4733763cc2f1280f3add2fee3ff065
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 28 21:33:18 2011 +0100
ditch W4W filter support
The W4W filter was a third party filter, only available in binary format,
for Windows, Solaris (partially IIRC), and maybe Linux (pic issues if it
was). It was only available for StarOffice, so hauling around support for
it doesn't gain us anything anymore.
diff --git a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
index 6d90fac..caa1c55 100644
--- a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
+++ b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
@@ -99,7 +99,6 @@ void _InitFilter()
_SetFltPtr( nCnt, ReadSwg, FILTER_SWGV );
_SetFltPtr( nCnt, new Sw6Reader, sSwDos );
_SetFltPtr( nCnt, (ReadAscii = new AsciiReader), FILTER_BAS );
- _SetFltPtr( nCnt, new W4WReader, FILTER_W4W );
_SetFltPtr( nCnt, ( pRd = new ExcelReader ), sCExcel );
_SetFltPtr( nCnt, pRd, sExcel );
_SetFltPtr( nCnt, new LotusReader, sLotusD );
diff --git a/binfilter/bf_sw/source/ui/app/sw_swcomlib.cxx b/binfilter/bf_sw/source/ui/app/sw_swcomlib.cxx
index 35caceb..ea2cb44 100644
--- a/binfilter/bf_sw/source/ui/app/sw_swcomlib.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_swcomlib.cxx
@@ -135,21 +135,10 @@ ULONG SwDLL::DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter,
nRet = ERRCODE_ABORT;
- else if( *ppFilter && (*ppFilter)->GetUserData().EqualsAscii( "W4W", 0, 3 )
- && pTmp->GetUserData().EqualsAscii( FILTER_TEXT, 0, 4 ) )
- {
- // Bug 95262 - if the user (or short detect) select a
- // Word 4 Word filter, but the autodect of mastersoft
- // can't detect it, we normally return the ascii filter
- // But the user may have a change to use the W4W filter,
- // so the SFX must show now a dialog with the 2 filters
- nRet = ERRCODE_SFX_CONSULTUSER;
- *ppFilter = pTmp;
- }
// sollte der voreingestellte Filter ASCII sein und wir haben
// ASCII erkannt, dann ist das ein gultiger Filter, ansonsten ist das
// ein Fehler und wir wollen die Filterbox sehen
- else if( pTmp->GetUserData().EqualsAscii( FILTER_TEXT ))
+ if( pTmp->GetUserData().EqualsAscii( FILTER_TEXT ))
{
// Bug 28974: "Text" erkannt, aber "Text Dos" "Text ..." eingestellt
// -> keine FilterBox, sondern den eingestellten Filter benutzen
diff --git a/binfilter/inc/bf_sw/iodetect.hxx b/binfilter/inc/bf_sw/iodetect.hxx
index eb56dd5..d81c4db 100644
--- a/binfilter/inc/bf_sw/iodetect.hxx
+++ b/binfilter/inc/bf_sw/iodetect.hxx
@@ -58,8 +58,7 @@ struct SwIoDetect
inline Reader* GetReader() const { return pReader; }
#endif
- const sal_Char* IsReader(const sal_Char* pHeader, ULONG nInLen,
- const String &rFileName) const;
+ const sal_Char* IsReader(const sal_Char* pHeader, ULONG nInLen) const;
};
@@ -72,29 +71,10 @@ struct SwIoDetect
#ifdef DEBUG_SH
#define DEB_SH_SwIoEntry(sNm, cCharLen, pWrt, bDel) , SwIoEntry(sNm, cCharLen, pWrt, bDel)
-#define W4W_CHECK_FOR_INTERNAL_FILTER \
- if( nW4WId == 3 ) \
- for( nCnt = 0; nCnt < nFltrCount; nCnt++ ) \
- if( 0 == ( pFilter = pFCntnr->GetFilter( nCnt ))-> \
- GetUserData().Search( sW4W_Int )) \
- return pFilter;
-
-#define W4W_INFOBOX InfoBox(0, String("Textformat wurde nicht erkannt.")).Execute();
-
-#define W4W_FILTER_NOT_FOUND \
- aW4WName = String::CreateFromAscii("W4W-Filter Nr. "); \
- aW4WName += String::CreateFromInt32(nW4WId); \
- aW4WName += '.'; \
- aW4WName += String::CreateFromInt32(nVersion); \
- aW4WName.AppendAscii(" detected, ist aber nicht installiert");\
- InfoBox( 0, aW4WName ).Execute();
#else
#define DEB_SH_SwIoEntry(sNm, cCharLen, pWrt, bDel)
-#define W4W_CHECK_FOR_INTERNAL_FILTER
-#define W4W_INFOBOX
-#define W4W_FILTER_NOT_FOUND
#endif
@@ -105,7 +85,7 @@ struct SwIoDetect
#endif
-const USHORT MAXFILTER = 13;
+const USHORT MAXFILTER = 12;
#define FORAMTNAME_SW4 "StarWriter 4.0"
#define FORAMTNAME_SW3 "StarWriter 3.0"
@@ -119,7 +99,6 @@ sal_Char FILTER_SW4[] = "CSW4"; \
sal_Char FILTER_SW5[] = "CSW5"; \
sal_Char FILTER_BAS[] = "BAS"; \
sal_Char FILTER_RTF[] = "RTF"; \
-sal_Char FILTER_W4W[] = "W4W"; \
sal_Char FILTER_SWGV[] = "SWGV"; \
sal_Char FILTER_SW3V[] = "CSW3V"; \
sal_Char FILTER_SW4V[] = "CSW4V"; \
@@ -139,7 +118,6 @@ sal_Char sWW6[] = "CWW6"; \
sal_Char FILTER_WW8[] = "CWW8"; \
sal_Char FILTER_TEXT_DLG[] = "TEXT_DLG"; \
sal_Char FILTER_TEXT[] = "TEXT"; \
-sal_Char sW4W_Int[] = "W4_INT"; \
sal_Char sDebug[] = "DEBUG"; \
sal_Char sUndo[] = "UNDO"; \
sal_Char FILTER_XML[] = "CXML"; \
@@ -156,12 +134,11 @@ SwIoDetect aReaderWriter[ MAXFILTER ] = { \
{/* 4*/ SwIoEntry(FILTER_SWGV, 4, FALSE)}, \
{/* 5*/ SwIoEntry(sSwDos, STRING_LEN, TRUE)}, \
{/* 6*/ SwIoEntry(FILTER_BAS, STRING_LEN, FALSE)}, \
- {/* 7*/ SwIoEntry(FILTER_W4W, 3, TRUE)}, \
- {/* 8*/ SwIoEntry(sCExcel, 5, TRUE)}, \
- {/* 9*/ SwIoEntry(sExcel, 4, FALSE)}, \
- {/*10*/ SwIoEntry(sLotusD, 5, TRUE)}, \
- {/*11*/ SwIoEntry(sSwg1, 4, FALSE)}, \
- {/*12*/ SwIoEntry(FILTER_TEXT, 4, TRUE)} \
+ {/* 7*/ SwIoEntry(sCExcel, 5, TRUE)}, \
+ {/* 8*/ SwIoEntry(sExcel, 4, FALSE)}, \
+ {/* 9*/ SwIoEntry(sLotusD, 5, TRUE)}, \
+ {/*10*/ SwIoEntry(sSwg1, 4, FALSE)}, \
+ {/*11*/ SwIoEntry(FILTER_TEXT, 4, TRUE)} \
};
// Filter erkennung
@@ -194,8 +171,8 @@ struct W1_FIB
#endif
#define IO_DETECT_IMPL2 \
-const sal_Char* SwIoDetect::IsReader(const sal_Char* pHeader, ULONG nInLen, \
- const String &rFileName) const \
+const sal_Char* SwIoDetect::IsReader(const sal_Char* pHeader, ULONG nInLen )\
+ const \
{ \
int bRet = FALSE; \
if( FILTER_SWG == pName ) \
@@ -240,8 +217,6 @@ const sal_Char* SwIoDetect::IsReader(const sal_Char* pHeader, ULONG nInLen, \
} \
else if (FILTER_TEXT == pName) \
bRet = SwIoSystem::IsDetectableText(pHeader, nInLen); \
- else if (FILTER_W4W == pName) \
- bRet = SwIoSystem::IsDetectableW4W(rFileName); \
return bRet ? pName : 0; \
} \
@@ -379,7 +354,7 @@ bool SwIoSystem::IsFileFilter( SfxMedium& rMedium, const String& rFmtName,
for( USHORT i = 0; i < MAXFILTER; ++i ) \
if( aReaderWriter[i].IsFilter( rFmtName ) ) \
{ \
- bRet = 0 != aReaderWriter[i].IsReader( aBuffer, nBytesRead, rMedium.GetPhysicalName() ); \
+ bRet = 0 != aReaderWriter[i].IsReader( aBuffer, nBytesRead ); \
break; \
} \
} \
@@ -492,7 +467,7 @@ const SfxFilter* SwIoSystem::GetFileFilter( const String& rFileName, \
const SfxFilter* pLclFilter; \
const sal_Char* pNm; \
for( USHORT n = 0; n < MAXFILTER; ++n ) \
- if( 0 != ( pNm = aReaderWriter[n].IsReader(aBuffer, nBytesRead, rFileName)) && \
+ if( 0 != ( pNm = aReaderWriter[n].IsReader(aBuffer, nBytesRead)) && \
0 != ( pLclFilter = SwIoSystem::GetFilterOfFormat( \
String::CreateFromAscii(pNm), pFCntnr ))) \
return pLclFilter; \
@@ -504,26 +479,6 @@ const SfxFilter* SwIoSystem::GetFileFilter( const String& rFileName, \
{ \
if( pMedium ) \
pMedium->CloseInStream(); \
- USHORT nVersion, nW4WId = AutoDetec( rFileName, nVersion ); \
- \
- if( 1 < nW4WId ) \
- { \
- String aW4WName( String::CreateFromAscii(FILTER_W4W )); \
- if( nW4WId < 10 ) \
- aW4WName += '0'; \
- aW4WName += String::CreateFromInt32(nW4WId); \
- aW4WName += '_'; \
- aW4WName += String::CreateFromInt32(nVersion); \
- \
- for( USHORT nCnt = 0; nCnt < nFltrCount; ++nCnt ) \
- if( 0 == ( pFilter = pFCntnr->GetFilter( nCnt ))-> \
- GetUserData().Search( aW4WName )) \
- return pFilter; \
- \
- W4W_CHECK_FOR_INTERNAL_FILTER \
- W4W_FILTER_NOT_FOUND \
- return 0; \
- } \
} \
return SwIoSystem::GetTextFilter( aBuffer, nBytesRead); \
} \
@@ -674,19 +629,6 @@ const SfxFilter* SwIoSystem::GetTextFilter( const sal_Char* pBuf, ULONG nInLen)\
const sal_Char* pNm = bAuto ? FILTER_TEXT : FILTER_TEXT_DLG; \
return SwIoSystem::GetFilterOfFormat( String::CreateFromAscii(pNm), 0 ); \
} \
-\
-\
-bool SwIoSystem::IsDetectableW4W(const String& rFileName) \
-{ \
- bool bRet(false); \
- if (rFileName.Len()) \
- { \
- USHORT nVersion, nW4WId = AutoDetec( rFileName, nVersion );\
- if (nW4WId > 1)\
- bRet = true;\
- }\
- return bRet;\
-} \
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sw/shellio.hxx b/binfilter/inc/bf_sw/shellio.hxx
index fafc1c6..b85cadc 100644
--- a/binfilter/inc/bf_sw/shellio.hxx
+++ b/binfilter/inc/bf_sw/shellio.hxx
@@ -380,7 +380,6 @@ extern sal_Char FILTER_SWG[]; // SWG-Filter
extern sal_Char FILTER_RTF[]; // RTF-Filter
extern sal_Char FILTER_TEXT[]; // Text-Filter mit Default-CodeSet
extern sal_Char FILTER_BAS[]; // StarBasic (identisch mit ANSI)
-extern sal_Char FILTER_W4W[]; // W4W-Filter
extern sal_Char FILTER_WW8[]; // WinWord 97-Filter
extern sal_Char FILTER_SW3[]; // SW3-Storage Filter
extern sal_Char FILTER_SW4[]; // SW4-Storage Filter
More information about the Libreoffice-commits
mailing list