summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--svx/source/gallery2/galmisc.cxx6
-rw-r--r--svx/source/gallery2/galobj.cxx6
-rw-r--r--svx/source/gallery2/galtheme.cxx11
-rw-r--r--svx/source/items/frmitems.cxx10
-rw-r--r--svx/source/items/paraitem.cxx16
-rw-r--r--svx/source/items/textitem.cxx12
-rw-r--r--svx/source/svdraw/svdxcgv.cxx10
7 files changed, 35 insertions, 36 deletions
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index cd2ab941c393..1f2bdd85eb8e 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: galmisc.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: ka $ $Date: 2000-12-09 15:24:55 $
+ * last change: $Author: mib $ $Date: 2001-02-06 15:24:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -195,7 +195,7 @@ BOOL SGASvDrawImport( SvStream& rIStm, FmFormModel& rModel )
{
SgaUserDataFactory aFactory;
- rIStm.SetVersion( SOFFICE_FILEFORMAT_NOW );
+ rIStm.SetVersion( SOFFICE_FILEFORMAT_50 );
rModel.SetStreamingSdrModel( TRUE );
rModel.GetItemPool().Load( rIStm );
rIStm >> rModel;
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 916c7732c410..80dad7453f34 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: galobj.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: ka $ $Date: 2000-11-21 13:08:52 $
+ * last change: $Author: mib $ $Date: 2001-02-06 15:24:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -163,7 +163,7 @@ void SgaObject::WriteData( SvStream& rOut ) const
const ULONG nOldVersion = rOut.GetVersion();
rOut.SetCompressMode( COMPRESSMODE_ZBITMAP );
- rOut.SetVersion( SOFFICE_FILEFORMAT_NOW );
+ rOut.SetVersion( SOFFICE_FILEFORMAT_50 );
rOut << aThumbBmp;
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 677b0b1148de..dfaff2b51123 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: galtheme.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: ka $ $Date: 2001-01-31 11:22:20 $
+ * last change: $Author: mib $ $Date: 2001-02-06 15:24:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -824,7 +824,7 @@ BOOL GalleryTheme::InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos )
if( pOStm )
{
- pOStm->SetVersion( SOFFICE_FILEFORMAT_NOW );
+ pOStm->SetVersion( SOFFICE_FILEFORMAT_50 );
bRet = ( GraphicConverter::Export( *pOStm, rGraphic, nExportFormat ) == ERRCODE_NONE );
delete pOStm;
}
@@ -839,7 +839,7 @@ BOOL GalleryTheme::InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos )
if( pOStm )
{
- pOStm->SetVersion( SOFFICE_FILEFORMAT_NOW );
+ pOStm->SetVersion( SOFFICE_FILEFORMAT_50 );
aMtf.Write( *pOStm );
bRet = ( pOStm->GetError() == ERRCODE_NONE );
delete pOStm;
@@ -904,8 +904,7 @@ BOOL GalleryTheme::InsertModel( const FmFormModel& rModel, ULONG nInsertPos )
RLECodec aCodec( *xOStm );
FmFormModel* pFormModel = (FmFormModel*) &rModel;
-
- aMemStm.SetVersion( SOFFICE_FILEFORMAT_NOW );
+ aMemStm.SetVersion( SOFFICE_FILEFORMAT_50 );
pFormModel->SetStreamingSdrModel( TRUE );
pFormModel->PreSave();
pFormModel->GetItemPool().SetFileFormatVersion( aMemStm.GetVersion() );
diff --git a/svx/source/items/frmitems.cxx b/svx/source/items/frmitems.cxx
index 332f921f8551..a12c1d12ff29 100644
--- a/svx/source/items/frmitems.cxx
+++ b/svx/source/items/frmitems.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: frmitems.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: mib $ $Date: 2000-12-13 10:06:41 $
+ * last change: $Author: mib $ $Date: 2001-02-06 15:29:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -925,7 +925,7 @@ SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) con
if ( IsBulletFI() )
{
// Ab 6.0 keine Magicnumber schreiben...
- DBG_ASSERT( SOFFICE_FILEFORMAT_NOW <= SOFFICE_FILEFORMAT_50, "MT: Fileformat SvxLRSpaceItem aendern!" );
+ DBG_ASSERT( rStrm.GetVersion() <= SOFFICE_FILEFORMAT_50, "MT: Fileformat SvxLRSpaceItem aendern!" );
rStrm << (sal_uInt32) BULLETLR_MARKER;
rStrm << nSaveFI;
}
@@ -3223,7 +3223,7 @@ sal_uInt16 SvxBoxItem::GetVersion( sal_uInt16 nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ||
- SOFFICE_FILEFORMAT_NOW==nFFVer,
+ SOFFICE_FILEFORMAT_50==nFFVer,
"SvxBoxItem: Gibt es ein neues Fileformat?" );
return SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ? 0 : BOX_4DISTS_VERSION;
@@ -3902,7 +3902,7 @@ sal_uInt16 SvxFmtBreakItem::GetVersion( sal_uInt16 nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ||
- SOFFICE_FILEFORMAT_NOW==nFFVer,
+ SOFFICE_FILEFORMAT_50==nFFVer,
"SvxFmtBreakItem: Gibt es ein neues Fileformat?" );
return SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ? 0 : FMTBREAK_NOAUTO;
diff --git a/svx/source/items/paraitem.cxx b/svx/source/items/paraitem.cxx
index aa3e30eeac18..c1153aea7516 100644
--- a/svx/source/items/paraitem.cxx
+++ b/svx/source/items/paraitem.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: paraitem.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: os $ $Date: 2001-02-02 11:42:20 $
+ * last change: $Author: mib $ $Date: 2001-02-06 15:29:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1754,10 +1754,10 @@ USHORT SvxScriptSpaceItem::GetVersion( USHORT nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ||
- SOFFICE_FILEFORMAT_NOW==nFFVer,
+ SOFFICE_FILEFORMAT_50==nFFVer,
"SvxTwoLinesItem: Gibt es ein neues Fileformat?" );
- return SOFFICE_FILEFORMAT_NOW > nFFVer ? USHRT_MAX : 0;
+ return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
}
SfxItemPresentation SvxScriptSpaceItem::GetPresentation(
@@ -1807,10 +1807,10 @@ USHORT SvxHangingPunctuationItem::GetVersion( USHORT nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ||
- SOFFICE_FILEFORMAT_NOW==nFFVer,
+ SOFFICE_FILEFORMAT_50==nFFVer,
"SvxHangingPunctuationItem: Gibt es ein neues Fileformat?" );
- return SOFFICE_FILEFORMAT_NOW > nFFVer ? USHRT_MAX : 0;
+ return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
}
SfxItemPresentation SvxHangingPunctuationItem::GetPresentation(
@@ -1865,10 +1865,10 @@ USHORT SvxForbiddenRuleItem::GetVersion( USHORT nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ||
- SOFFICE_FILEFORMAT_NOW==nFFVer,
+ SOFFICE_FILEFORMAT_50==nFFVer,
"SvxForbiddenRuleItem: Gibt es ein neues Fileformat?" );
- return SOFFICE_FILEFORMAT_NOW > nFFVer ? USHRT_MAX : 0;
+ return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
}
/* -----------------------------29.11.00 11:23--------------------------------
diff --git a/svx/source/items/textitem.cxx b/svx/source/items/textitem.cxx
index bf79238289bf..aa5f52761cb2 100644
--- a/svx/source/items/textitem.cxx
+++ b/svx/source/items/textitem.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: textitem.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: jp $ $Date: 2001-02-01 14:17:31 $
+ * last change: $Author: mib $ $Date: 2001-02-06 15:29:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -3862,10 +3862,10 @@ USHORT SvxEmphasisMarkItem::GetVersion( USHORT nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ||
- SOFFICE_FILEFORMAT_NOW==nFFVer,
+ SOFFICE_FILEFORMAT_50==nFFVer,
"SvxEmphasisMarkItem: Gibt es ein neues Fileformat?" );
- return SOFFICE_FILEFORMAT_NOW > nFFVer ? USHRT_MAX : 0;
+ return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
}
@@ -4013,10 +4013,10 @@ USHORT SvxTwoLinesItem::GetVersion( USHORT nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ||
- SOFFICE_FILEFORMAT_NOW==nFFVer,
+ SOFFICE_FILEFORMAT_50==nFFVer,
"SvxTwoLinesItem: Gibt es ein neues Fileformat?" );
- return SOFFICE_FILEFORMAT_NOW > nFFVer ? USHRT_MAX : 0;
+ return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
}
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 5194e83c78b0..e1691fe52cec 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: svdxcgv.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: ka $ $Date: 2001-01-31 12:08:47 $
+ * last change: $Author: mib $ $Date: 2001-02-06 15:30:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -539,7 +539,7 @@ void SdrExchangeView::ImpYank(ULONG nFormat, BOOL bClp) const
pModel->SetStreamingSdrModel(TRUE);
pModel->RemoveNotPersistentObjects(TRUE); // OLE, etc. entfernen
SvMemoryStream aMemStream(4096,4096);
- aMemStream.SetVersion(SOFFICE_FILEFORMAT_NOW);
+ aMemStream.SetVersion(SOFFICE_FILEFORMAT_50);
// StyleSheetPool und Persist fehlt hier wohl noch ...
pModel->GetItemPool().SetFileFormatVersion( aMemStream.GetVersion() );
pModel->GetItemPool().Store(aMemStream);
@@ -576,7 +576,7 @@ void SdrExchangeView::ImpYank(ULONG nFormat, BOOL bClp) const
{
if (nFormat==SDR_ANYFORMAT || nFormat==nEEFormat) {
SvMemoryStream aMemStream(4096,4096);
- aMemStream.SetVersion(SOFFICE_FILEFORMAT_NOW);
+ aMemStream.SetVersion(SOFFICE_FILEFORMAT_50);
((EditEngine&)rOutliner.GetEditEngine()).Write(aMemStream,EE_FORMAT_BIN);
if (bClp) Clipboard::CopyData(aMemStream.GetData(),aMemStream.GetSize(),nEEFormat);
else DragServer::CopyData(aMemStream.GetData(),aMemStream.GetSize(),nEEFormat);
@@ -829,7 +829,7 @@ BOOL SdrExchangeView::ImpPaste(ULONG nFormat, BOOL bClp, USHORT nItemNum, const
{
SvMemoryStream aMemStream(pDataBuf, nDataLen, STREAM_READ);
- aMemStream.SetVersion(SOFFICE_FILEFORMAT_NOW);
+ aMemStream.SetVersion(SOFFICE_FILEFORMAT_50);
SdrModel* pModel = pMod->AllocModel();
generated by cgit (git 2.34.1) at 2025-03-16 05:41:55 +0000