summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/inc/shellres.hxx12
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx31
-rw-r--r--sw/source/filter/ww1/fltshell.cxx30
-rw-r--r--sw/source/filter/ww8/ww8par.cxx25
-rw-r--r--sw/source/ui/utlui/initui.cxx20
-rw-r--r--sw/source/ui/utlui/initui.hrc7
-rw-r--r--sw/source/ui/utlui/initui.src20
7 files changed, 95 insertions, 50 deletions
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 97fdb8cb0bf6..b6fc152623bb 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: shellres.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:27 $
+ * last change: $Author: jp $ $Date: 2001-01-26 15:43:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -77,7 +77,6 @@
struct ShellResource : public Resource
{
-
String aPostItAuthor;
String aPostItPage;
String aPostItLine;
@@ -120,12 +119,19 @@ struct ShellResource : public Resource
// die AutoFormat-Redline-Kommentare
inline const SvStringsDtor& GetAutoFmtNameLst() const;
+ // returns for the specific filter the new names of pagedescs
+ // This method is for the old code of the specific filters with
+ // now localized names
+ String GetPageDescName( USHORT nNo, BOOL bFirst = FALSE,
+ BOOL bFollow = FALSE );
+
ShellResource();
~ShellResource();
private:
void _GetAutoFmtNameLst() const;
SvStringsDtor *pAutoFmtNameLst;
+ String sPageDescFirstName, sPageDescFollowName, sPageDescName;
};
inline const SvStringsDtor& ShellResource::GetAutoFmtNameLst() const
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index 10270d227e05..b3c3a3dee5c3 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: swparrtf.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: jp $ $Date: 2000-11-06 09:30:33 $
+ * last change: $Author: jp $ $Date: 2001-01-26 15:42:30 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -218,6 +218,12 @@
#ifndef _FMTCLBL_HXX
#include <fmtclbl.hxx>
#endif
+#ifndef _VIEWSH_HXX // for the pagedescname from the ShellRes
+#include <viewsh.hxx>
+#endif
+#ifndef _SHELLRES_HXX // for the pagedescname from the ShellRes
+#include <shellres.hxx>
+#endif
#ifndef _SWSWERROR_H
#include <swerror.h>
@@ -1340,19 +1346,9 @@ void SwRTFParser::MakeStyleTab()
SwPageDesc* SwRTFParser::_MakeNewPageDesc( int bFirst )
{
- USHORT* pNo = &nAktPageDesc;
- String aNm( String::CreateFromAscii(
- RTL_CONSTASCII_STRINGPARAM( "RTF-SectionPage(" )));
-
- if( bFirst )
- {
- aNm.InsertAscii( "First", 4 );
- pNo = &nAktFirstPageDesc;
- }
- aNm += String::CreateFromInt32( pDoc->GetPageDescCnt() );
- aNm += ')';
-
- USHORT nNew = pDoc->MakePageDesc( aNm, 0 );
+ USHORT* pNo = bFirst ? &nAktFirstPageDesc : &nAktPageDesc;
+ USHORT nNew = pDoc->MakePageDesc( ViewShell::GetShellRes()->
+ GetPageDescName( pDoc->GetPageDescCnt(), bFirst ), 0 );
SwPageDesc& rAkt = pDoc->_GetPageDesc( nNew );
SwPageDesc& rOld = pDoc->_GetPageDesc( *pNo );
pDoc->CopyPageDesc( rOld, rAkt, FALSE );
@@ -3759,11 +3755,14 @@ static void DumpEnde()
Source Code Control System - Header
- $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/rtf/swparrtf.cxx,v 1.2 2000-11-06 09:30:33 jp Exp $
+ $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/rtf/swparrtf.cxx,v 1.3 2001-01-26 15:42:30 jp Exp $
Source Code Control System - Update
$Log: not supported by cvs2svn $
+ Revision 1.2 2000/11/06 09:30:33 jp
+ must changes: tempfile
+
Revision 1.1.1.1 2000/09/18 17:14:56 hr
initial import
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 3f18bc6ba1fe..4f1118f273be 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fltshell.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:57 $
+ * last change: $Author: jp $ $Date: 2001-01-26 15:42:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -188,6 +188,12 @@
#ifndef _FLTSHELL_HXX
#include <fltshell.hxx>
#endif
+#ifndef _VIEWSH_HXX // for the pagedescname from the ShellRes
+#include <viewsh.hxx>
+#endif
+#ifndef _SHELLRES_HXX // for the pagedescname from the ShellRes
+#include <shellres.hxx>
+#endif
#define MAX_FIELDLEN 64000
@@ -2122,17 +2128,10 @@ SwPageDesc* SwFltShell::MakePageDesc(SwPageDesc* pFirstPageDesc)
// Erkennung doppelter Namen fehlt noch (Wahrscheinlichkeit
// fuer dopp. Namen ist gering)
-// Namen zusammenbasteln
- String aNm( String::CreateFromAscii(
- RTL_CONSTASCII_STRINGPARAM( "Konvert ")));
- if (bFollow)
- aNm.AppendAscii( "Folge" );
- aNm += String(GetDoc().GetPageDescCnt());
- if (!bFollow)
- nPos = GetDoc().MakePageDesc(aNm, 0);
- else
- nPos = GetDoc().MakePageDesc(aNm,
- pFirstPageDesc);// alles uebernehmen
+ nPos = GetDoc().MakePageDesc( ViewShell::GetShellRes()->GetPageDescName(
+ GetDoc().GetPageDescCnt(), FALSE, bFollow ),
+ pFirstPageDesc );
+
pNewPD = &((SwPageDesc&)GetDoc().GetPageDesc(nPos));
if (bFollow)
{ // Dieser ist der folgende von pPageDesc
@@ -2194,11 +2193,14 @@ void SwFltShell::NextStyle(USHORT nWhich, USHORT nNext)
Source Code Control System - Header
- $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww1/fltshell.cxx,v 1.1.1.1 2000-09-18 17:14:57 hr Exp $
+ $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww1/fltshell.cxx,v 1.2 2001-01-26 15:42:07 jp Exp $
Source Code Control System - Update
$Log: not supported by cvs2svn $
+ Revision 1.1.1.1 2000/09/18 17:14:57 hr
+ initial import
+
Revision 1.57 2000/09/18 16:04:55 willem.vandorp
OpenOffice header added.
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 8a2fdf889b81..fdb6e7863fa9 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ww8par.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: os $ $Date: 2001-01-22 09:05:58 $
+ * last change: $Author: jp $ $Date: 2001-01-26 15:43:22 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -218,14 +218,18 @@
#ifndef _DOCUFLD_HXX //autogen
#include <docufld.hxx>
#endif
-#if SUPD>612
#ifndef _SWFLTOPT_HXX
#include <swfltopt.hxx>
#endif
-#endif
#ifndef _FLTINI_HXX
#include <fltini.hxx>
#endif
+#ifndef _VIEWSH_HXX // for the pagedescname from the ShellRes
+#include <viewsh.hxx>
+#endif
+#ifndef _SHELLRES_HXX // for the pagedescname from the ShellRes
+#include <shellres.hxx>
+#endif
#ifdef DEBUG
#ifndef _DOCARY_HXX //autogen
@@ -1179,13 +1183,9 @@ SwPageDesc* SwWW8ImplReader::CreatePageDesc( SwPageDesc* pFirstPageDesc,
return pFirstPageDesc; // Fehler: hat schon Follow
// compose name of PageDescriptor
- String aNm( WW8_ASCII2STR( "Konvert " ) );
- if ( bFollow )
- aNm.AppendAscii( "Folge" );
USHORT nPageDescCount = rDoc.GetPageDescCnt();
- aNm += String::CreateFromInt32( nPageDescCount );
-
- nPos = rDoc.MakePageDesc( aNm,
+ nPos = rDoc.MakePageDesc( ViewShell::GetShellRes()->GetPageDescName(
+ nPageDescCount, FALSE, bFollow ),
bFollow // && (pFirstPageDesc != &rDoc._GetPageDesc( 0 ))
? pFirstPageDesc
: 0 );
@@ -2981,11 +2981,14 @@ void SwMSDffManager::ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd,
Source Code Control System - Header
- $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par.cxx,v 1.7 2001-01-22 09:05:58 os Exp $
+ $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par.cxx,v 1.8 2001-01-26 15:43:22 jp Exp $
Source Code Control System - Update
$Log: not supported by cvs2svn $
+ Revision 1.7 2001/01/22 09:05:58 os
+ update of filter configuration
+
Revision 1.6 2000/12/15 15:33:06 cmc
#79055# OCX FormControls changes
diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx
index 37df5e7592f9..79691f351d5c 100644
--- a/sw/source/ui/utlui/initui.cxx
+++ b/sw/source/ui/utlui/initui.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: initui.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: obo $ $Date: 2000-11-22 11:47:43 $
+ * last change: $Author: jp $ $Date: 2001-01-26 15:44:02 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -191,6 +191,9 @@ ShellResource::ShellResource()
aTOXObjectsName( SW_RES(STR_TOX_OBJ)),
aTOXTablesName( SW_RES(STR_TOX_TBL)),
aTOXAuthoritiesName( SW_RES(STR_TOX_AUTH)),
+ sPageDescFirstName( SW_RES(STR_PAGEDESC_FIRSTNAME)),
+ sPageDescFollowName( SW_RES(STR_PAGEDESC_FOLLOWNAME)),
+ sPageDescName( SW_RES(STR_PAGEDESC_NAME)),
pAutoFmtNameLst( 0 )
{
const USHORT nCount = FLD_DOCINFO_END - FLD_DOCINFO_BEGIN;
@@ -210,6 +213,16 @@ ShellResource::~ShellResource()
delete pAutoFmtNameLst, pAutoFmtNameLst = 0;
}
+String ShellResource::GetPageDescName( USHORT nNo, BOOL bIsFirst, BOOL bFollow )
+{
+ String sRet( bIsFirst ? sPageDescFirstName
+ : bFollow ? sPageDescFollowName
+ : sPageDescName );
+ sRet.SearchAndReplaceAscii( "$(ARG1)", String::CreateFromInt32( nNo ));
+ return sRet;
+}
+
+
SwGlossaries* GetGlossaries()
{
if (!pGlossaries)
@@ -302,6 +315,9 @@ const String& SwAuthorityFieldType::GetAuthTypeName(ToxAuthorityType eType)
/*************************************************************************
$Log: not supported by cvs2svn $
+ Revision 1.4 2000/11/22 11:47:43 obo
+ #65293# wrong methodname localedatawrapper
+
Revision 1.3 2000/11/20 09:02:23 jp
should change: use LocaleDataWrapper
diff --git a/sw/source/ui/utlui/initui.hrc b/sw/source/ui/utlui/initui.hrc
index eda73a8a1e7b..6e7971d42784 100644
--- a/sw/source/ui/utlui/initui.hrc
+++ b/sw/source/ui/utlui/initui.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: initui.hrc,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:50 $
+ * last change: $Author: jp $ $Date: 2001-01-26 15:44:02 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -90,5 +90,8 @@
#define STR_TOX_OBJ 22
#define STR_TOX_TBL 23
#define STR_TOX_AUTH 24
+#define STR_PAGEDESC_NAME 25
+#define STR_PAGEDESC_FIRSTNAME 26
+#define STR_PAGEDESC_FOLLOWNAME 27
#endif
diff --git a/sw/source/ui/utlui/initui.src b/sw/source/ui/utlui/initui.src
index e4532d0430ae..0cdca931058e 100644
--- a/sw/source/ui/utlui/initui.src
+++ b/sw/source/ui/utlui/initui.src
@@ -2,9 +2,9 @@
*
* $RCSfile: initui.src,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: kz $ $Date: 2001-01-19 20:53:37 $
+ * last change: $Author: jp $ $Date: 2001-01-26 15:44:02 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1022,6 +1022,22 @@ Resource RID_SW_SHELLRES
};
BITMAP BMP_FRAME_ANCHOR { FILE = "anchor.bmp" ; };
BITMAP BMP_FRAME_DRAG_ANCHOR { FILE = "danchor.bmp" ; };
+
+ String STR_PAGEDESC_NAME
+ {
+ Text = "Konvert $(ARG1)" ;
+ Text [ ENGLISH ] = "Convert $(ARG1)" ;
+ };
+ String STR_PAGEDESC_FIRSTNAME
+ {
+ Text = "Erste Konvert $(ARG1)" ;
+ Text [ ENGLISH ] = "First convert $(ARG1)" ;
+ };
+ String STR_PAGEDESC_FOLLOWNAME
+ {
+ Text = "Konvert Folge $(ARG1)" ;
+ Text [ ENGLISH ] = "Convert follow $(ARG1)" ;
+ };
};
String STR_AUTH_TYPE_ARTICLE
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 02:26:02 +0000