[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 9 commits - basctl/source boost/boost_1_48_0.patch comphelper/source configmgr/qa configmgr/source connectivity/source crashrep/source cui/source dbaccess/source default_images/res desktop/scripts desktop/source desktop/win32 editeng/source extensions/source filter/source framework/source instsetoo_native/util officecfg/registry postprocess/packcomponents postprocess/packregistry sal/osl scp2/source scripting/examples scripting/java scripting/source sc/source sd/source setup_native/scripts setup_native/source sfx2/source solenv/bin solenv/gbuild solenv/inc svtools/source svx/sdi svx/source sw/inc sw/sdi sw/source sw/uiconfig tools/source unotools/source ure/source vcl/aqua vcl/source vcl/unx vcl/win writerfilter/source
Herbert Dürr
hdu at apache.org
Thu Apr 18 17:18:04 PDT 2013
basctl/source/basicide/baside2.cxx | 2
boost/boost_1_48_0.patch | 37 ++
comphelper/source/officeinstdir/officeinstallationdirectories.cxx | 16 -
configmgr/qa/unit/makefile.mk | 2
configmgr/source/components.cxx | 16 -
connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx | 8
crashrep/source/win32/soreport.cpp | 2
cui/source/dialogs/about.cxx | 16 -
dbaccess/source/ui/misc/UITools.cxx | 35 +-
default_images/res/commandimagelist/lc_fliphorizontal.png |binary
default_images/res/commandimagelist/lc_flipvertical.png |binary
default_images/res/commandimagelist/lch_fliphorizontal.png |binary
default_images/res/commandimagelist/lch_flipvertical.png |binary
default_images/res/commandimagelist/sc_fliphorizontal.png |binary
default_images/res/commandimagelist/sc_flipvertical.png |binary
desktop/scripts/soffice.sh | 11
desktop/source/app/app.cxx | 4
desktop/source/app/appfirststart.cxx | 2
desktop/source/deployment/misc/dp_update.cxx | 2
desktop/source/deployment/registry/sfwk/dp_sfwk.cxx | 4
desktop/source/pkgchk/unopkg/unopkg_app.cxx | 4
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 2
desktop/source/splash/splash.cxx | 6
desktop/win32/source/extendloaderenvironment.cxx | 19 -
editeng/source/editeng/impedit3.cxx | 4
extensions/source/update/check/updatecheck.cxx | 2
extensions/source/update/check/updateprotocol.cxx | 4
extensions/source/update/feed/updatefeed.cxx | 9
filter/source/msfilter/msocximex.cxx | 2
framework/source/services/substitutepathvars.cxx | 2
instsetoo_native/util/makefile.mk | 51 +--
instsetoo_native/util/openoffice.lst | 6
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 10
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 18 -
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 26 -
postprocess/packcomponents/makefile.mk | 19 +
postprocess/packregistry/makefile.mk | 26 +
sal/osl/unx/signal.c | 2
sc/source/core/tool/interpr1.cxx | 2
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 2
scp2/source/ooo/common_brand.scp | 100 ++++--
scp2/source/ooo/directory_ooo.scp | 61 ++--
scp2/source/ooo/file_ooo.scp | 3
scp2/source/ooo/makefile.mk | 6
scp2/source/ooo/ooo_brand.scp | 12
scp2/source/ooo/profile_ooo.scp | 3
scp2/source/ooo/profileitem_ooo.scp | 147 +++++++---
scp2/source/ooo/ure.scp | 129 +-------
scp2/source/ooo/ure_into_ooo.scp | 77 ++---
scripting/examples/beanshell/Highlight/ShowDialog.bsh | 2
scripting/examples/java/Highlight/HighlightText.java | 2
scripting/examples/javascript/Highlight/ShowDialog.js | 2
scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java | 4
scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java | 12
scripting/source/provider/URIHelper.cxx | 5
scripting/source/pyprov/pythonscript.py | 4
scripting/source/storage/ScriptStorageManager.cxx | 2
sd/source/ui/app/sdmod2.cxx | 2
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 6
setup_native/scripts/install_linux.sh | 4
setup_native/scripts/install_solaris.sh | 4
setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx | 3
setup_native/source/win32/customactions/patch/swappatchfiles.cxx | 3
setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx | 4
sfx2/source/appl/appmisc.cxx | 2
sfx2/source/appl/shutdownicon.cxx | 2
sfx2/source/doc/objmisc.cxx | 24 -
solenv/bin/macosx-change-install-names.pl | 39 ++
solenv/gbuild/platform/os2.mk | 2
solenv/gbuild/platform/windows.mk | 2
solenv/gbuild/platform/winmingw.mk | 2
solenv/inc/settings.mk | 8
solenv/inc/unxfbsd.mk | 15 -
solenv/inc/unxlng.mk | 15 -
solenv/inc/unxsoli4.mk | 15 -
solenv/inc/unxsols4.mk | 15 -
solenv/inc/unxsolu4.mk | 12
svtools/source/filter/filter.cxx | 4
svx/sdi/svx.sdi | 38 +-
svx/source/dialog/docrecovery.cxx | 2
svx/source/dialog/sendreportunx.cxx | 2
svx/source/svdraw/svdattr.cxx | 24 -
svx/source/svdraw/svdlayer.cxx | 8
svx/source/svdraw/svdmodel.cxx | 34 +-
svx/source/unodraw/recoveryui.cxx | 2
sw/inc/cmdid.h | 2
sw/sdi/_grfsh.sdi | 12
sw/sdi/drawsh.sdi | 12
sw/sdi/swriter.sdi | 52 ---
sw/source/core/docnode/node.cxx | 4
sw/source/core/docnode/node2lay.cxx | 2
sw/source/core/layout/ftnfrm.cxx | 2
sw/source/core/unocore/unofield.cxx | 2
sw/source/ui/dialog/SwSpellDialogChildWindow.cxx | 14
sw/source/ui/shells/drawsh.cxx | 28 +
sw/source/ui/shells/grfsh.cxx | 11
sw/source/ui/shells/textsh2.cxx | 2
sw/uiconfig/sglobal/menubar/menubar.xml | 2
sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml | 2
sw/uiconfig/sweb/menubar/menubar.xml | 2
sw/uiconfig/swform/menubar/menubar.xml | 2
sw/uiconfig/swform/toolbar/graphicobjectbar.xml | 4
sw/uiconfig/swreport/menubar/menubar.xml | 4
sw/uiconfig/swreport/toolbar/graphicobjectbar.xml | 2
sw/uiconfig/swriter/menubar/menubar.xml | 2
sw/uiconfig/swriter/toolbar/graphicobjectbar.xml | 2
sw/uiconfig/swxform/menubar/menubar.xml | 2
sw/uiconfig/swxform/toolbar/graphicobjectbar.xml | 2
tools/source/rc/resmgr.cxx | 4
unotools/source/config/bootstrap.cxx | 4
unotools/source/config/configmgr.cxx | 2
ure/source/jvmfwk3.ini | 2
ure/source/jvmfwk3rc | 2
vcl/aqua/source/gdi/salgdi.cxx | 21 -
vcl/source/gdi/bitmap3.cxx | 2
vcl/source/gdi/imagerepository.cxx | 2
vcl/source/gdi/impimagetree.cxx | 6
vcl/source/window/accel.cxx | 2
vcl/unx/generic/app/saldata.cxx | 2
vcl/unx/generic/fontmanager/helper.cxx | 2
vcl/win/source/gdi/salgdi3.cxx | 4
writerfilter/source/dmapper/GraphicImport.cxx | 12
122 files changed, 778 insertions(+), 695 deletions(-)
New commits:
commit 40b65cda94f45a87e31006b4947eeff4a1818dc0
Author: Herbert Dürr <hdu at apache.org>
Date: Thu Apr 18 12:52:07 2013 +0000
fix typo
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index ddba097..b118f55 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -2041,7 +2041,7 @@ XubString __EXPORT SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const
if((FieldUnit)nPos == FUNIT_NONE)
{
- cont sal_Char aText[] = "default";
+ const sal_Char aText[] = "default";
aRetval += UniString(aText, sizeof(aText)-1);
}
else
commit b7ff116e58df419aa40ccc93a3e785810afba5ae
Author: Herbert Dürr <hdu at apache.org>
Date: Thu Apr 18 12:44:11 2013 +0000
WaE: fix suspicious assignments in if-conditions
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index f3545cd..3d7ef9b 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1576,54 +1576,65 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType
switch(_nDataType)
{
case DataType::TINYINT:
- if( pTypeInfo = queryTypeInfoByType(DataType::SMALLINT,_rTypeInfo))
+ pTypeInfo = queryTypeInfoByType(DataType::SMALLINT,_rTypeInfo);
+ if( pTypeInfo != NULL)
break;
// run through
case DataType::SMALLINT:
- if( pTypeInfo = queryTypeInfoByType(DataType::INTEGER,_rTypeInfo))
+ pTypeInfo = queryTypeInfoByType(DataType::INTEGER,_rTypeInfo);
+ if( pTypeInfo != NULL)
break;
// run through
case DataType::INTEGER:
- if( pTypeInfo = queryTypeInfoByType(DataType::FLOAT,_rTypeInfo))
+ pTypeInfo = queryTypeInfoByType(DataType::FLOAT,_rTypeInfo);
+ if( pTypeInfo != NULL)
break;
// run through
case DataType::FLOAT:
- if( pTypeInfo = queryTypeInfoByType(DataType::REAL,_rTypeInfo))
+ pTypeInfo = queryTypeInfoByType(DataType::REAL,_rTypeInfo);
+ if( pTypeInfo != NULL)
break;
// run through
case DataType::DATE:
case DataType::TIME:
if( DataType::DATE == _nDataType || DataType::TIME == _nDataType )
{
- if( pTypeInfo = queryTypeInfoByType(DataType::TIMESTAMP,_rTypeInfo))
+ pTypeInfo = queryTypeInfoByType(DataType::TIMESTAMP,_rTypeInfo);
+ if( pTypeInfo != NULL)
break;
}
// run through
case DataType::TIMESTAMP:
case DataType::REAL:
case DataType::BIGINT:
- if ( pTypeInfo = queryTypeInfoByType(DataType::DOUBLE,_rTypeInfo) )
+ pTypeInfo = queryTypeInfoByType(DataType::DOUBLE,_rTypeInfo);
+ if( pTypeInfo != NULL)
break;
// run through
case DataType::DOUBLE:
- if ( pTypeInfo = queryTypeInfoByType(DataType::NUMERIC,_rTypeInfo) )
+ pTypeInfo = queryTypeInfoByType(DataType::NUMERIC,_rTypeInfo);
+ if( pTypeInfo != NULL)
break;
// run through
case DataType::NUMERIC:
- pTypeInfo = queryTypeInfoByType(DataType::DECIMAL,_rTypeInfo);
+ pTypeInfo = queryTypeInfoByType(DataType::DECIMAL,_rTypeInfo);
break;
case DataType::DECIMAL:
- if ( pTypeInfo = queryTypeInfoByType(DataType::NUMERIC,_rTypeInfo) )
+ pTypeInfo = queryTypeInfoByType(DataType::NUMERIC,_rTypeInfo);
+ if( pTypeInfo != NULL)
break;
- if ( pTypeInfo = queryTypeInfoByType(DataType::DOUBLE,_rTypeInfo) )
+ pTypeInfo = queryTypeInfoByType(DataType::DOUBLE,_rTypeInfo);
+ if( pTypeInfo != NULL)
break;
break;
case DataType::VARCHAR:
- if ( pTypeInfo = queryTypeInfoByType(DataType::LONGVARCHAR,_rTypeInfo) )
+ pTypeInfo = queryTypeInfoByType(DataType::LONGVARCHAR,_rTypeInfo);
+ if( pTypeInfo != NULL)
break;
break;
case DataType::LONGVARCHAR:
- if ( pTypeInfo = queryTypeInfoByType(DataType::CLOB,_rTypeInfo) )
+ pTypeInfo = queryTypeInfoByType(DataType::CLOB,_rTypeInfo);
+ if( pTypeInfo != NULL)
break;
break;
default:
commit 0132cc18f59a802e2dfb986af9180ee3769cefb3
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Thu Apr 18 12:37:46 2013 +0000
switch URL used for checking for application updates to an HTTPS one
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 3c3b82a..ee14c94 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -71,7 +71,7 @@ Apache_OpenOffice
ABOUTBOXPRODUCTVERSION 4.0.0
BASEPRODUCTVERSION 4.0
PCPFILENAME openoffice.pcp
- UPDATEURL http://www.openoffice.org/projects/update/aoo40/check.Update
+ UPDATEURL https://ooo-site.apache.org/projects/update/aoo40/check.Update
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
@@ -130,7 +130,7 @@ Apache_OpenOffice_wJRE
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0.0
BASEPRODUCTVERSION 4.0
- UPDATEURL http://www.openoffice.org/projects/update/aoo40/check.Update
+ UPDATEURL https://ooo-site.apache.org/projects/update/aoo40/check.Update
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
@@ -197,7 +197,7 @@ Apache_OpenOffice_Dev
UREPACKAGEPREFIX aoodev
SOLSUREPACKAGEPREFIX aoodev
REGISTRYLAYERNAME LayerDev
- UPDATEURL http://www.openoffice.org/projects/update/aoo40/check.Update
+ UPDATEURL https://ooo-site.apache.org/projects/update/aoo40/check.Update
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
EVAL
PACKAGEVERSION 4.0.0
commit 4a1dc6ee938563e4455a60cda8f4d7afdff550fd
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Thu Apr 18 12:03:39 2013 +0000
121803: fix cropping on DOCX import
Patch by: Sven Jacobi
Review by: orw
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 28d9903..4efc12c 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1088,6 +1088,18 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
uno::makeAny( aSize.Height ) );
xGraphProps->setPropertyValue( rtl::OUString::createFromAscii( "Width" ),
uno::makeAny( aSize.Width ) );
+
+ {
+ text::GraphicCrop aGraphicCrop( 0, 0, 0, 0 );
+ uno::Reference< beans::XPropertySet > xSourceGraphProps( xShape, uno::UNO_QUERY );
+ uno::Any aAny = xSourceGraphProps->getPropertyValue( rtl::OUString::createFromAscii("GraphicCrop"));
+ if ( aAny >>= aGraphicCrop )
+ {
+ xGraphProps->setPropertyValue(
+ rtl::OUString::createFromAscii("GraphicCrop"),
+ uno::makeAny( aGraphicCrop ) );
+ }
+ }
}
}
catch( const beans::UnknownPropertyException e )
commit 4e620795e1decaad8e8a25c3028ad0c270925eb4
Author: Herbert Dürr <hdu at apache.org>
Date: Thu Apr 18 11:57:35 2013 +0000
WaE: fix implicit conversions from boolean false to the NULL pointer
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 2c6c112..f370d3c 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -543,7 +543,7 @@ sal_Bool ModulWindow::SaveBasicSource()
{
Sequence< ::rtl::OUString > aPaths = xFP->getFiles();
aCurPath = aPaths[0];
- SfxMedium aMedium( aCurPath, STREAM_WRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC, sal_True, sal_False );
+ SfxMedium aMedium( aCurPath, STREAM_WRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC, sal_True, NULL );
SvStream* pStream = aMedium.GetOutStream();
if ( pStream )
{
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 9809295..57fe483 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3717,10 +3717,10 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRec, OutputDevi
pVDev->Erase();
}
}
- DBG_ASSERT( bVDevValid, "VDef konnte nicht vergroessert werden!" );
+ DBG_ASSERT( bVDevValid, "VirtualDevice failed to be enlarged!" );
if ( !bVDevValid )
{
- Paint( pView, rRec, sal_False /* ohne VDev */ );
+ Paint( pView, rRec, NULL /* without VirtualDevice */ );
return;
}
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 04ede5c..b7a9241 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -6506,7 +6506,7 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( sal_Bool& rMissingField )
return pParam.release();
}
}
- return false;
+ return NULL;
}
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index a266aab..3b0f45f 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1166,7 +1166,7 @@ ScChangeTrack* XclExpChangeTrack::CreateTempChangeTrack()
DBG_ASSERT( nOrigCount == pTempDoc->GetTableCount(),
"XclExpChangeTrack::CreateTempChangeTrack - table count mismatch" );
if( nOrigCount != pTempDoc->GetTableCount() )
- return sal_False;
+ return NULL;
return pOrigChangeTrack->Clone(pTempDoc);
}
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 45d3094..e29b33f 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -710,7 +710,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet )
sal_uInt32 nCntrl;
SdDrawDocument* pDocument = pDocSh->GetDoc();
- SdrOutliner& rOutl = pDocument->GetDrawOutliner( sal_False );
+ SdrOutliner& rOutl = pDocument->GetDrawOutliner( NULL );
nCntrl = rOutl.GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION;
rOutl.SetControlWord( nCntrl | nSum );
::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False );
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index d6f4185..f80119d 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -734,7 +734,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
pDoc->SetSummationOfParagraphs( bIsSummationOfParagraphs );
SdDrawDocument* pDocument = pDocSh->GetDoc();
- SdrOutliner& rOutl = pDocument->GetDrawOutliner( sal_False );
+ SdrOutliner& rOutl = pDocument->GetDrawOutliner( NULL );
nCntrl = rOutl.GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION;
rOutl.SetControlWord( nCntrl | nSum );
::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False );
@@ -763,7 +763,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
pDoc->SetCharCompressType( (sal_uInt16)nCharCompressType );
SdDrawDocument* pDocument = pDocSh->GetDoc();
- SdrOutliner& rOutl = pDocument->GetDrawOutliner( sal_False );
+ SdrOutliner& rOutl = pDocument->GetDrawOutliner( NULL );
rOutl.SetAsianCompressionMode( (sal_uInt16)nCharCompressType );
::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False );
if( pOutl )
@@ -788,7 +788,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
pDoc->SetKernAsianPunctuation( bAsianPunct );
SdDrawDocument* pDocument = pDocSh->GetDoc();
- SdrOutliner& rOutl = pDocument->GetDrawOutliner( sal_False );
+ SdrOutliner& rOutl = pDocument->GetDrawOutliner( NULL );
rOutl.SetKernAsianPunctuation( bAsianPunct );
::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False );
if( pOutl )
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index a2faa56..fdf9e80 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -256,7 +256,7 @@ SfxModule* SfxApplication::GetModule_Impl()
{
SfxModule* pModule = SfxModule::GetActiveModule();
if ( !pModule )
- pModule = SfxModule::GetActiveModule( SfxViewFrame::GetFirst( sal_False ) );
+ pModule = SfxModule::GetActiveModule( SfxViewFrame::GetFirst( NULL ) );
if( pModule )
return pModule;
else
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 6c32c39..58e91d8 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -631,8 +631,8 @@ const SwPageDesc* SwNode::FindPageDesc( sal_Bool bCalcLay,
}
if( n >= rFmts.Count() )
{
- ASSERT( !this, "Fly-Section aber kein Format gefunden" );
- return sal_False;
+ ASSERT( !this, "Fly-Section but no format found" );
+ return NULL;
}
}
}
diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx
index 757e779..c7c137f 100644
--- a/sw/source/core/docnode/node2lay.cxx
+++ b/sw/source/core/docnode/node2lay.cxx
@@ -201,7 +201,7 @@ SwFrm* SwNode2LayImpl::NextFrm()
{
SwFrm* pRet;
if( !pIter )
- return sal_False;
+ return NULL;
if( !bInit )
{
pRet = pIter->First();
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 82e3b36..1c4da43 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -1211,7 +1211,7 @@ SwFtnFrm *SwFtnBossFrm::FindFirstFtn()
pBoss = pRet->GetRef()->FindFtnBossFrm();
ASSERT( pBoss, "FindFirstFtn: No boss found" );
if( !pBoss )
- return sal_False; // ?There must be a bug, but no GPF
+ return NULL; // ?There must be a bug, but no GPF
pPage = pBoss->FindPageFrm();
nPgNum = pPage->GetPhyPageNum();
if ( nPgNum == nRefNum )
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 2dc0852..b07b585 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -2190,7 +2190,7 @@ uno::Any SwXTextField::getPropertyValue(const OUString& rPropertyName)
break;
case FIELD_PROP_IS_FIELD_USED:
case FIELD_PROP_IS_FIELD_DISPLAYED:
- aRet.setValue( sal_False, ::getCppuBooleanType() );
+ aRet.setValue( NULL, ::getCppuBooleanType() );
break;
}
}
diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
index e49e10f..18429be 100644
--- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
@@ -251,7 +251,7 @@ svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck)
{
m_pSpellState->pOtherCursor = new SwPaM(*pWrtShell->GetCrsr()->GetPoint());
m_pSpellState->m_bStartedInOther = true;
- pWrtShell->SpellStart( DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_CURR, sal_False );
+ pWrtShell->SpellStart( DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_CURR, NULL );
}
else
{
@@ -264,7 +264,7 @@ svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck)
*pWrtShell->GetDoc(),
*pCrsr->Start(), pCrsr->End());
}
- pWrtShell->SpellStart( DOCPOS_START, DOCPOS_END, DOCPOS_CURR, sal_False );
+ pWrtShell->SpellStart( DOCPOS_START, DOCPOS_END, DOCPOS_CURR, NULL );
}
}
else
@@ -309,7 +309,7 @@ The code below would only be part of the solution.
//if there's any that has not been spelled yet
if(!m_pSpellState->m_bOtherSpelled && pWrtShell->HasOtherCnt())
{
- pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_OTHERSTART, sal_False );
+ pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_OTHERSTART, NULL );
if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn))
{
pWrtShell->SpellEnd();
@@ -321,7 +321,7 @@ The code below would only be part of the solution.
//if no result has been found try at the body text - completely
if(!m_pSpellState->m_bBodySpelled && !aRet.size())
{
- pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END, DOCPOS_START, sal_False );
+ pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END, DOCPOS_START, NULL );
if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn))
{
m_pSpellState->m_bBodySpelled = true;
@@ -350,7 +350,7 @@ The code below would only be part of the solution.
pWrtShell->SpellEnd();
delete m_pSpellState->pOtherCursor;
m_pSpellState->pOtherCursor = 0;
- pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_CURR, DOCPOS_OTHERSTART, sal_False );
+ pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_CURR, DOCPOS_OTHERSTART, NULL );
pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn);
}
if(!aRet.size())
@@ -363,7 +363,7 @@ The code below would only be part of the solution.
//has the body been spelled?
if(!m_pSpellState->m_bBodySpelled)
{
- pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END, DOCPOS_START, sal_False );
+ pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END, DOCPOS_START, NULL );
if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn))
{
m_pSpellState->m_bBodySpelled = true;
@@ -376,7 +376,7 @@ The code below would only be part of the solution.
m_pSpellState->m_bBodySpelled = true;
if(!m_pSpellState->m_bOtherSpelled && pWrtShell->HasOtherCnt())
{
- pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_OTHERSTART, sal_False );
+ pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_OTHERSTART, NULL );
if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn))
{
pWrtShell->SpellEnd();
diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx
index be13189..a5b8077 100644
--- a/sw/source/ui/shells/textsh2.cxx
+++ b/sw/source/ui/shells/textsh2.cxx
@@ -220,7 +220,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
sDBName += (String)sColumnName;
SwFldMgr aFldMgr(GetShellPtr());
- SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, aEmptyStr, 0, sal_False, sal_True);
+ SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, aEmptyStr, 0, NULL, sal_True);
if(pConnectionItem)
aData.aDBConnection = ((SfxUsrAnyItem*)pConnectionItem)->GetValue();
if(pColumnItem)
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 33cc96a..d54ba2d 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -341,7 +341,7 @@ sal_Bool Bitmap::Convert( BmpConversion eConversion )
case( BMP_CONVERSION_24BIT ):
{
if( nBitCount < 24 )
- bRet = ImplConvertUp( 24, sal_False );
+ bRet = ImplConvertUp( 24, NULL );
else
bRet = sal_True;
}
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 7962a20..5bca70f 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -637,7 +637,7 @@ Accelerator* Accelerator::GetAccel( const KeyCode rKeyCode ) const
if ( pEntry )
return pEntry->mpAccel;
else
- return sal_False;
+ return NULL;
}
// -----------------------------------------------------------------------
commit dbdf44038976177f0145da65eff0d6fae44ad722
Author: Herbert Dürr <hdu at apache.org>
Date: Thu Apr 18 11:54:17 2013 +0000
WaE: fix wrong use of sizeof operation
sizeof(ARRAY-1)==sizeof(&ARRAY[0]) but obviously sizeof(ARRAY)-1 was meant
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 1acba74..ddba097 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -1410,10 +1410,10 @@ SfxItemPresentation __EXPORT SdrTextAniAmountItem::GetPresentation(
if(nValue < 0)
{
- sal_Char aText[] = "pixel";
+ const sal_Char aText[] = "pixel";
rText = UniString::CreateFromInt32(-nValue);
- rText += UniString(aText, sizeof(aText-1));
+ rText += UniString(aText, sizeof(aText)-1);
}
else
{
@@ -2041,8 +2041,8 @@ XubString __EXPORT SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const
if((FieldUnit)nPos == FUNIT_NONE)
{
- sal_Char aText[] = "default";
- aRetval += UniString(aText, sizeof(aText-1));
+ cont sal_Char aText[] = "default";
+ aRetval += UniString(aText, sizeof(aText)-1);
}
else
{
@@ -2354,26 +2354,26 @@ XubString __EXPORT SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const
{
case 1:
{
- sal_Char aTextGreys[] = "Greys";
- aStr += UniString(aTextGreys, sizeof(aTextGreys-1));
+ const sal_Char aTextGreys[] = "Greys";
+ aStr += UniString(aTextGreys, sizeof(aTextGreys)-1);
break;
}
case 2:
{
- sal_Char aTextBlackWhite[] = "Black/White";
- aStr += UniString(aTextBlackWhite, sizeof(aTextBlackWhite-1));
+ const sal_Char aTextBlackWhite[] = "Black/White";
+ aStr += UniString(aTextBlackWhite, sizeof(aTextBlackWhite)-1);
break;
}
case 3:
{
- sal_Char aTextWatermark[] = "Watermark";
- aStr += UniString(aTextWatermark, sizeof(aTextWatermark-1));
+ const sal_Char aTextWatermark[] = "Watermark";
+ aStr += UniString(aTextWatermark, sizeof(aTextWatermark)-1);
break;
}
default:
{
- sal_Char aTextStandard[] = "Standard";
- aStr += UniString(aTextStandard, sizeof(aTextStandard-1));
+ const sal_Char aTextStandard[] = "Standard";
+ aStr += UniString(aTextStandard, sizeof(aTextStandard)-1);
break;
}
}
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 4bdcc44..3444b0a 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -238,8 +238,8 @@ SdrLayerAdmin::SdrLayerAdmin(SdrLayerAdmin* pNewParent):
aLSets(1024,16,16),
pModel(NULL)
{
- sal_Char aTextControls[] = "Controls";
- aControlLayerName = String(aTextControls, sizeof(aTextControls-1));
+ const sal_Char aTextControls[] = "Controls";
+ aControlLayerName = String(aTextControls, sizeof(aTextControls)-1);
pParent=pNewParent;
}
@@ -249,8 +249,8 @@ SdrLayerAdmin::SdrLayerAdmin(const SdrLayerAdmin& rSrcLayerAdmin):
pParent(NULL),
pModel(NULL)
{
- sal_Char aTextControls[] = "Controls";
- aControlLayerName = String(aTextControls, sizeof(aTextControls-1));
+ const sal_Char aTextControls[] = "Controls";
+ aControlLayerName = String(aTextControls, sizeof(aTextControls)-1);
*this = rSrcLayerAdmin;
}
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 0f2686b..77da8ec 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1222,20 +1222,20 @@ void SdrModel::TakeUnitStr(FieldUnit eUnit, XubString& rStr)
}
case FUNIT_100TH_MM:
{
- sal_Char aText[] = "/100mm";
- rStr = UniString(aText, sizeof(aText-1));
+ const sal_Char aText[] = "/100mm";
+ rStr = UniString(aText, sizeof(aText)-1);
break;
}
case FUNIT_MM :
{
- sal_Char aText[] = "mm";
- rStr = UniString(aText, sizeof(aText-1));
+ const sal_Char aText[] = "mm";
+ rStr = UniString(aText, sizeof(aText)-1);
break;
}
case FUNIT_CM :
{
- sal_Char aText[] = "cm";
- rStr = UniString(aText, sizeof(aText-1));
+ const sal_Char aText[] = "cm";
+ rStr = UniString(aText, sizeof(aText)-1);
break;
}
case FUNIT_M :
@@ -1246,26 +1246,26 @@ void SdrModel::TakeUnitStr(FieldUnit eUnit, XubString& rStr)
}
case FUNIT_KM :
{
- sal_Char aText[] = "km";
- rStr = UniString(aText, sizeof(aText-1));
+ const sal_Char aText[] = "km";
+ rStr = UniString(aText, sizeof(aText)-1);
break;
}
case FUNIT_TWIP :
{
- sal_Char aText[] = "twip";
- rStr = UniString(aText, sizeof(aText-1));
+ const sal_Char aText[] = "twip";
+ rStr = UniString(aText, sizeof(aText)-1);
break;
}
case FUNIT_POINT :
{
- sal_Char aText[] = "pt";
- rStr = UniString(aText, sizeof(aText-1));
+ const sal_Char aText[] = "pt";
+ rStr = UniString(aText, sizeof(aText)-1);
break;
}
case FUNIT_PICA :
{
sal_Char aText[] = "pica";
- rStr = UniString(aText, sizeof(aText-1));
+ rStr = UniString(aText, sizeof(aText)-1);
break;
}
case FUNIT_INCH :
@@ -1276,14 +1276,14 @@ void SdrModel::TakeUnitStr(FieldUnit eUnit, XubString& rStr)
}
case FUNIT_FOOT :
{
- sal_Char aText[] = "ft";
- rStr = UniString(aText, sizeof(aText-1));
+ const sal_Char aText[] = "ft";
+ rStr = UniString(aText, sizeof(aText)-1);
break;
}
case FUNIT_MILE :
{
- sal_Char aText[] = "mile(s)";
- rStr = UniString(aText, sizeof(aText-1));
+ const sal_Char aText[] = "mile(s)";
+ rStr = UniString(aText, sizeof(aText)-1);
break;
}
case FUNIT_PERCENT:
commit 1ea8067f70bb806aa501ea72686a950f1e5ee591
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Thu Apr 18 11:16:00 2013 +0000
122026: adjust names of newly introduced UNO commands; correct uno:FlipHorizontal and uno:FlipVertical
diff --git a/default_images/res/commandimagelist/lc_fliphorizontal.png b/default_images/res/commandimagelist/lc_fliphorizontal.png
index fd582af..67c5743 100644
Binary files a/default_images/res/commandimagelist/lc_fliphorizontal.png and b/default_images/res/commandimagelist/lc_fliphorizontal.png differ
diff --git a/default_images/res/commandimagelist/lc_flipvertical.png b/default_images/res/commandimagelist/lc_flipvertical.png
index 67c5743..fd582af 100644
Binary files a/default_images/res/commandimagelist/lc_flipvertical.png and b/default_images/res/commandimagelist/lc_flipvertical.png differ
diff --git a/default_images/res/commandimagelist/lch_fliphorizontal.png b/default_images/res/commandimagelist/lch_fliphorizontal.png
index d050635..7e36441 100644
Binary files a/default_images/res/commandimagelist/lch_fliphorizontal.png and b/default_images/res/commandimagelist/lch_fliphorizontal.png differ
diff --git a/default_images/res/commandimagelist/lch_flipvertical.png b/default_images/res/commandimagelist/lch_flipvertical.png
index 7e36441..d050635 100644
Binary files a/default_images/res/commandimagelist/lch_flipvertical.png and b/default_images/res/commandimagelist/lch_flipvertical.png differ
diff --git a/default_images/res/commandimagelist/sc_fliphorizontal.png b/default_images/res/commandimagelist/sc_fliphorizontal.png
index 5fc16dc..5487379 100644
Binary files a/default_images/res/commandimagelist/sc_fliphorizontal.png and b/default_images/res/commandimagelist/sc_fliphorizontal.png differ
diff --git a/default_images/res/commandimagelist/sc_flipvertical.png b/default_images/res/commandimagelist/sc_flipvertical.png
index 5487379..5fc16dc 100644
Binary files a/default_images/res/commandimagelist/sc_flipvertical.png and b/default_images/res/commandimagelist/sc_flipvertical.png differ
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 96eb65b..b333de1 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1282,6 +1282,11 @@
<value xml:lang="en-US">Filter</value>
</prop>
</node>
+ <node oor:name=".uno:FormatCellBorders" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Format Cell Borders</value>
+ </prop>
+ </node>
<node oor:name=".uno:GroupOutlineMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Group and Outline</value>
@@ -1317,11 +1322,6 @@
<value xml:lang="en-US">Row</value>
</prop>
</node>
- <node oor:name=".uno:SCDialogBorder" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Cell Borders</value>
- </prop>
- </node>
<node oor:name=".uno:SendTo" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Send</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 225c630..b888d8f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5147,15 +5147,21 @@
<value>9</value>
</prop>
</node>
- <node oor:name=".uno:SvxFlipHorizontal" oor:op="replace">
+ <node oor:name=".uno:FlipHorizontal" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Flip Horizontally</value>
</prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
</node>
- <node oor:name=".uno:SvxFlipVertical" oor:op="replace">
+ <node oor:name=".uno:FlipVertical" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Flip Vertically</value>
</prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
</node>
<node oor:name=".uno:SwEditOptions" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
@@ -5498,7 +5504,7 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:TransAngle" oor:op="replace">
+ <node oor:name=".uno:TransformRotationAngle" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Rotation Angle</value>
</prop>
@@ -5511,12 +5517,12 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:TransRotX" oor:op="replace">
+ <node oor:name=".uno:TransformRotationX" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Rotation Pivot Point X</value>
</prop>
</node>
- <node oor:name=".uno:TransRotY" oor:op="replace">
+ <node oor:name=".uno:TransformRotationY" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Rotation Pivot Point Y</value>
</prop>
@@ -5841,7 +5847,7 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:FontDialogEff" oor:op="replace">
+ <node oor:name=".uno:FontEffectsDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Character Font Effects...</value>
</prop>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index eceafc3..3f85cc7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -380,22 +380,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:FlipHorizontal" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Flip Vertically</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:FlipVertical" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Flip Horizontally</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:FootnoteDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Footnotes/Endnotes...</value>
@@ -1188,6 +1172,11 @@
<value xml:lang="en-US">Page Columns</value>
</prop>
</node>
+ <node oor:name=".uno:PageColumnType" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Page Column Type</value>
+ </prop>
+ </node>
<node oor:name=".uno:PageDown" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Next Page</value>
@@ -1551,11 +1540,6 @@
<value xml:lang="en-US">Backspace</value>
</prop>
</node>
- <node oor:name=".uno:SwPageColumnType" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Page Column Type</value>
- </prop>
- </node>
<node oor:name=".uno:TableBoundaries" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Table Boundaries</value>
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 482efeb..9f3c5b1 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -3883,7 +3883,7 @@ SfxVoidItem FontDialog SID_CHAR_DLG
GroupId = GID_FORMAT;
]
-SfxVoidItem FontDialogEff SID_CHAR_DLG_EFFECT
+SfxVoidItem FontEffectsDialog SID_CHAR_DLG_EFFECT
()
[
/* flags: */
@@ -15457,7 +15457,7 @@ XLineEndItem LineEnd SID_ATTR_LINE_END
//--------------------------------------------------------------------------
-SfxUInt32Item SvxTransFormPosX SID_ATTR_TRANSFORM_POS_X
+SfxUInt32Item TransformPosX SID_ATTR_TRANSFORM_POS_X
[
/* flags: */
AutoUpdate = TRUE,
@@ -15484,7 +15484,7 @@ SfxUInt32Item SvxTransFormPosX SID_ATTR_TRANSFORM_POS_X
//--------------------------------------------------------------------------
-SfxUInt32Item SvxTransFormPosY SID_ATTR_TRANSFORM_POS_Y
+SfxUInt32Item TransformPosY SID_ATTR_TRANSFORM_POS_Y
[
/* flags: */
AutoUpdate = TRUE,
@@ -15511,7 +15511,7 @@ SfxUInt32Item SvxTransFormPosY SID_ATTR_TRANSFORM_POS_Y
//--------------------------------------------------------------------------
-SfxUInt32Item SvxTransFormWidth SID_ATTR_TRANSFORM_WIDTH
+SfxUInt32Item TransformWidth SID_ATTR_TRANSFORM_WIDTH
[
/* flags: */
AutoUpdate = TRUE,
@@ -15538,7 +15538,7 @@ SfxUInt32Item SvxTransFormWidth SID_ATTR_TRANSFORM_WIDTH
//--------------------------------------------------------------------------
-SfxUInt32Item SvxTransFormHeight SID_ATTR_TRANSFORM_HEIGHT
+SfxUInt32Item TransformHeight SID_ATTR_TRANSFORM_HEIGHT
[
/* flags: */
AutoUpdate = TRUE,
@@ -15565,7 +15565,7 @@ SfxUInt32Item SvxTransFormHeight SID_ATTR_TRANSFORM_HEIGHT
//--------------------------------------------------------------------------
-SfxUInt32Item TransAngle SID_ATTR_TRANSFORM_ANGLE
+SfxUInt32Item TransformRotationAngle SID_ATTR_TRANSFORM_ANGLE
[
AutoUpdate = TRUE,
Cachable = Cachable,
@@ -15590,7 +15590,7 @@ SfxUInt32Item TransAngle SID_ATTR_TRANSFORM_ANGLE
//--------------------------------------------------------------------------
-SfxUInt32Item TransRotX SID_ATTR_TRANSFORM_ROT_X
+SfxUInt32Item TransformRotationX SID_ATTR_TRANSFORM_ROT_X
[
AutoUpdate = TRUE,
Cachable = Cachable,
@@ -15615,7 +15615,7 @@ SfxUInt32Item TransRotX SID_ATTR_TRANSFORM_ROT_X
//--------------------------------------------------------------------------
-SfxUInt32Item TransRotY SID_ATTR_TRANSFORM_ROT_Y
+SfxUInt32Item TransformRotationY SID_ATTR_TRANSFORM_ROT_Y
[
AutoUpdate = TRUE,
Cachable = Cachable,
@@ -15690,7 +15690,7 @@ SfxBoolItem ProtectSize SID_ATTR_TRANSFORM_PROTECT_SIZE
//--------------------------------------------------------------------------
-SfxVoidItem SvxFlipHorizontal SID_FLIP_HORIZONTAL
+SfxVoidItem FlipHorizontal SID_FLIP_HORIZONTAL
[
/* flags: */
AutoUpdate = TRUE,
@@ -15708,16 +15708,16 @@ SfxVoidItem SvxFlipHorizontal SID_FLIP_HORIZONTAL
Readonly = FALSE,
/* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_FORMAT;
]
//--------------------------------------------------------------------------
-SfxVoidItem SvxFlipVertical SID_FLIP_VERTICAL
+SfxVoidItem FlipVertical SID_FLIP_VERTICAL
[
/* flags: */
AutoUpdate = TRUE,
@@ -15735,16 +15735,16 @@ SfxVoidItem SvxFlipVertical SID_FLIP_VERTICAL
Readonly = FALSE,
/* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_FORMAT;
]
//--------------------------------------------------------------------------
-SfxBoolItem SvxAutoWidth SID_ATTR_TRANSFORM_AUTOWIDTH
+SfxBoolItem AutomaticWidth SID_ATTR_TRANSFORM_AUTOWIDTH
[
/* flags: */
AutoUpdate = TRUE,
@@ -15771,7 +15771,7 @@ SfxBoolItem SvxAutoWidth SID_ATTR_TRANSFORM_AUTOWIDTH
//--------------------------------------------------------------------------
-SfxBoolItem SvxAutoHeight SID_ATTR_TRANSFORM_AUTOHEIGHT
+SfxBoolItem AutomaticHeight SID_ATTR_TRANSFORM_AUTOHEIGHT
[
/* flags: */
AutoUpdate = TRUE,
@@ -15849,7 +15849,7 @@ SvxLineItem BorderBLTR SID_ATTR_BORDER_DIAG_BLTR
//--------------------------------------------------------------------------
-SfxVoidItem SCDialogBorder SID_CELL_FORMAT_BORDER
+SfxVoidItem FormatCellBorders SID_CELL_FORMAT_BORDER
()
[
/* flags: */
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 71315a9..593d353 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -467,8 +467,6 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
#define FN_INDENT_TO_TABSTOP (FN_FORMAT + 17) /* Einrueckung auf die naechste Tabpostion */
//schon in svxids.hrc
//#define FN_SET_JUSTIFY_PARA (FN_FORMAT + 21) /* Ausrichtung Absatz */
-#define FN_FLIP_HORZ_GRAFIC (FN_FORMAT + 25) /* Spiegeln horizontal */
-#define FN_FLIP_VERT_GRAFIC (FN_FORMAT + 26) /* Spiegeln vertikal */
#define FN_SET_LINE_SPACE (FN_FORMAT + 27) /* Zeilenabstand parametrisiert */
#define FN_SET_ADJUST (FN_FORMAT + 28) /* Ausrichtung parametrisiert */
#define FN_SET_LRMARGIN (FN_FORMAT + 29) /* linker/rechter Rand */
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index 12114f1..ba636fa 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -26,12 +26,6 @@ interface BaseTextGraphic
Automation = FALSE;
]
{
- FN_FLIP_VERT_GRAFIC // status(final|play)
- [
- ExecMethod = ExecAttr ;
- StateMethod = GetAttrState ;
- DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
SID_FLIP_VERTICAL
[
ExecMethod = ExecAttr ;
@@ -39,12 +33,6 @@ interface BaseTextGraphic
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_FLIP_HORZ_GRAFIC // status(final|play)
- [
- ExecMethod = ExecAttr ;
- StateMethod = GetAttrState ;
- DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
SID_FLIP_HORIZONTAL
[
ExecMethod = ExecAttr ;
diff --git a/sw/sdi/drawsh.sdi b/sw/sdi/drawsh.sdi
index 7f784c7..17c8ea8 100644
--- a/sw/sdi/drawsh.sdi
+++ b/sw/sdi/drawsh.sdi
@@ -206,12 +206,6 @@ interface TextDraw : TextDrawBase
StateMethod = DisableState ;
]
- FN_FLIP_VERT_GRAFIC
- [
- ExecMethod = Execute ;
- StateMethod = GetState ;
- DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
SID_FLIP_VERTICAL
[
ExecMethod = Execute ;
@@ -219,12 +213,6 @@ interface TextDraw : TextDrawBase
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_FLIP_HORZ_GRAFIC
- [
- ExecMethod = Execute ;
- StateMethod = GetState ;
- DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
SID_FLIP_HORIZONTAL
[
ExecMethod = Execute ;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 480d622..5334819 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -1823,56 +1823,6 @@ SfxBoolItem Fields FN_VIEW_FIELDS
]
//--------------------------------------------------------------------------
-SfxVoidItem FlipHorizontal FN_FLIP_HORZ_GRAFIC
-()
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_FORMAT;
-]
-
-//--------------------------------------------------------------------------
-SfxVoidItem FlipVertical FN_FLIP_VERT_GRAFIC
-()
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_FORMAT;
-]
-
-//--------------------------------------------------------------------------
SvxColorItem FontColor SID_ATTR_CHAR_COLOR2
[
@@ -10232,7 +10182,7 @@ SfxVoidItem CopyHyperlinkLocation FN_COPY_HYPERLINK_LOCATION
]
-SfxInt16Item SwPageColumnType SID_ATTR_PAGE_COLUMN
+SfxInt16Item PageColumnType SID_ATTR_PAGE_COLUMN
[
/* flags: */
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index 4485a37..234cf7a 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -169,12 +169,10 @@ void SwDrawShell::Execute(SfxRequest &rReq)
}
break;
- case FN_FLIP_HORZ_GRAFIC:
- case SID_FLIP_HORIZONTAL:
+ case SID_FLIP_VERTICAL:
bMirror = sal_False;
/* no break */
- case FN_FLIP_VERT_GRAFIC:
- case SID_FLIP_VERTICAL:
+ case SID_FLIP_HORIZONTAL:
rSh.MirrorSelection( bMirror );
break;
@@ -348,16 +346,30 @@ void SwDrawShell::GetState(SfxItemSet& rSet)
rSet.Put( SfxBoolItem( nWhich, !GetView().IsDrawSelMode()));
break;
- case FN_FLIP_HORZ_GRAFIC:
- case SID_FLIP_HORIZONTAL:
+ case SID_FLIP_VERTICAL:
if ( !pSdrView->IsMirrorAllowed() || bProtected )
+ {
rSet.DisableItem( nWhich );
+ }
+ else
+ {
+ // TTTT - needs to be adapted in aw080:
+ // state is not kept for drawing objects --> provide not flipped state
+ rSet.Put( SfxBoolItem( nWhich, sal_False ) );
+ }
break;
- case FN_FLIP_VERT_GRAFIC:
- case SID_FLIP_VERTICAL:
+ case SID_FLIP_HORIZONTAL:
if ( !pSdrView->IsMirrorAllowed() || bProtected )
+ {
rSet.DisableItem( nWhich );
+ }
+ else
+ {
+ // TTTT - needs to be adapted in aw080:
+ // state is not kept for drawing objects --> provide not flipped state
+ rSet.Put( SfxBoolItem( nWhich, sal_False ) );
+ }
break;
case SID_FONTWORK:
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 357cb0c..847d0bd 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -382,16 +382,13 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq )
switch( nSlot )
{
- case FN_FLIP_VERT_GRAFIC:
- case FN_FLIP_HORZ_GRAFIC:
case SID_FLIP_VERTICAL:
case SID_FLIP_HORIZONTAL:
{
GetShell().GetCurAttr( aGrfSet );
- SwMirrorGrf aMirror( (SwMirrorGrf&)aGrfSet.Get(
- RES_GRFATR_MIRRORGRF ) );
+ SwMirrorGrf aMirror( (SwMirrorGrf&)aGrfSet.Get( RES_GRFATR_MIRRORGRF ) );
sal_uInt16 nMirror = aMirror.GetValue();
- if( FN_FLIP_VERT_GRAFIC == nSlot || nSlot==SID_FLIP_VERTICAL )
+ if ( nSlot==SID_FLIP_HORIZONTAL )
switch( nMirror )
{
case RES_MIRROR_GRAPH_DONT: nMirror = RES_MIRROR_GRAPH_VERT;
@@ -552,7 +549,7 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
break;
}
- case FN_FLIP_VERT_GRAFIC:
+ case SID_FLIP_HORIZONTAL:
if( !bParentCntProt )
{
MirrorGraph nState = static_cast< MirrorGraph >(((const SwMirrorGrf &) aCoreSet.Get(
@@ -563,7 +560,7 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
}
break;
- case FN_FLIP_HORZ_GRAFIC:
+ case SID_FLIP_VERTICAL:
if( !bParentCntProt )
{
MirrorGraph nState = static_cast< MirrorGraph >(((const SwMirrorGrf &) aCoreSet.Get(
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 824fa4a..b9d8be2 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -309,8 +309,8 @@
</menu:menu>
<menu:menu menu:id=".uno:FlipMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
<menu:menuitem menu:id=".uno:FlipVertical"/>
+ <menu:menuitem menu:id=".uno:FlipHorizontal"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:GroupMenu">
diff --git a/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml b/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
index a0e3f48..6d95d65 100644
--- a/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
@@ -33,8 +33,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
</toolbar:toolbar>
\ No newline at end of file
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index 475e968..e963f72 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -256,8 +256,8 @@
</menu:menu>
<menu:menu menu:id=".uno:FlipMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
<menu:menuitem menu:id=".uno:FlipVertical"/>
+ <menu:menuitem menu:id=".uno:FlipHorizontal"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:GroupMenu">
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index 84c524e..0f7d10d 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -309,8 +309,8 @@
</menu:menu>
<menu:menu menu:id=".uno:FlipMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
<menu:menuitem menu:id=".uno:FlipVertical"/>
+ <menu:menuitem menu:id=".uno:FlipHorizontal"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:GroupMenu">
diff --git a/sw/uiconfig/swform/toolbar/graphicobjectbar.xml b/sw/uiconfig/swform/toolbar/graphicobjectbar.xml
index a0e3f48..f947a24 100644
--- a/sw/uiconfig/swform/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/graphicobjectbar.xml
@@ -33,8 +33,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal"/>
- <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
</toolbar:toolbar>
\ No newline at end of file
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 84c524e..b7aeadc 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -309,8 +309,8 @@
</menu:menu>
<menu:menu menu:id=".uno:FlipMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
- <menu:menuitem menu:id=".uno:FlipVertical"/>
+ <menu:menuitem menu:id=".uno:FlipVertical"/>
+ <menu:menuitem menu:id=".uno:FlipHorizontal"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:GroupMenu">
diff --git a/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml b/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
index a0e3f48..6d95d65 100644
--- a/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
@@ -33,8 +33,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
</toolbar:toolbar>
\ No newline at end of file
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index ec4c2dc..062e405 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -313,8 +313,8 @@
</menu:menu>
<menu:menu menu:id=".uno:FlipMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
<menu:menuitem menu:id=".uno:FlipVertical"/>
+ <menu:menuitem menu:id=".uno:FlipHorizontal"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:GroupMenu">
diff --git a/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml b/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
index a0e3f48..6d95d65 100644
--- a/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
@@ -33,8 +33,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
</toolbar:toolbar>
\ No newline at end of file
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index 7c1038f..04b447e 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -310,8 +310,8 @@
</menu:menu>
<menu:menu menu:id=".uno:FlipMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
<menu:menuitem menu:id=".uno:FlipVertical"/>
+ <menu:menuitem menu:id=".uno:FlipHorizontal"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:GroupMenu">
diff --git a/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml b/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
index a0e3f48..6d95d65 100644
--- a/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
@@ -33,8 +33,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
</toolbar:toolbar>
\ No newline at end of file
commit 2af65172af2cfc768e4f44507a02e1b17a9806ba
Author: Jürgen Schmidt <jsc at apache.org>
Date: Thu Apr 18 09:58:02 2013 +0000
#121996# integrate first part to remove 3layer office
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index f4cf0de..5796d15 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -343,27 +343,27 @@ void OfficeInstallationDirectories::initDirs()
{
*m_pOfficeBrandDir =
xExpander->expandMacros(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR" ) ) );
+ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "$OOO_BASE_DIR" ) ) );
OSL_ENSURE( m_pOfficeBrandDir->getLength() > 0,
"Unable to obtain office brand installation directory!" );
makeCanonicalFileURL( *m_pOfficeBrandDir );
- *m_pOfficeBaseDir =
- xExpander->expandMacros(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":BaseInstallation}" ) ) );
+ *m_pOfficeBaseDir = *m_pOfficeBrandDir;
+ // xExpander->expandMacros(
+ // rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+ // "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":BaseInstallation}" ) ) );
- OSL_ENSURE( m_pOfficeBaseDir->getLength() > 0,
- "Unable to obtain office base installation directory!" );
+ // OSL_ENSURE( m_pOfficeBaseDir->getLength() > 0,
+ // "Unable to obtain office base installation directory!" );
makeCanonicalFileURL( *m_pOfficeBaseDir );
*m_pUserDir =
xExpander->expandMacros(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ) ) );
+ "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ) ) );
OSL_ENSURE( m_pUserDir->getLength() > 0,
"Unable to obtain office user data directory!" );
diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk
index 22452af..ea24171 100644
--- a/configmgr/qa/unit/makefile.mk
+++ b/configmgr/qa/unit/makefile.mk
@@ -68,7 +68,7 @@ TEST .PHONY: $(SHL1TARGETN) $(MISC)/unit.rdb
echo 'UNO_SHARED_PACKAGES_CACHE = $$OOO_BASE_DIR' \
>> $(MISC)/unitdata/basis/program/uno$(MY_INI)
echo 'UNO_USER_PACKAGES_CACHE =' \
- '$${$$BRAND_BASE_DIR/program/bootstrap$(MY_INI):UserInstallation}' \
+ '$${$$OOO_BASE_DIR/program/bootstrap$(MY_INI):UserInstallation}' \
>> $(MISC)/unitdata/basis/program/uno$(MY_INI)
mkdir $(MISC)/unitdata/basis/share
mkdir $(MISC)/unitdata/basis/share/registry
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 0cacc97..af9b846 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -515,18 +515,6 @@ Components::Components(
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/share/registry"))));
- parseXcsXcuLayer(
- 4,
- expand(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "$BRAND_BASE_DIR/share/registry"))));
- parseModuleLayer(
- 6,
- expand(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "$BRAND_BASE_DIR/share/registry/modules"))));
parseXcsXcuIniLayer(
7,
expand(
@@ -829,7 +817,7 @@ rtl::OUString Components::getModificationFileUrl() const {
return expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
+ "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
":UserInstallation}/user/registrymodifications.xcu")));
}
@@ -850,7 +838,7 @@ void Components::parseModificationLayer() {
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
+ "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
":UserInstallation}/user/registry/data"))),
false);
}
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index 37085b1..c83cc7a 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -122,13 +122,7 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists)
{
nsCOMPtr<nsILocalFile> binDir;
// Note: if path3 construction fails, mozilla will default to using MOZILLA_FIVE_HOME in the NS_InitXPCOM2()
- rtl::OUString path1(
-#if defined WNT
- RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program")
-#else
- RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program")
-#endif
- );
+ rtl::OUString path1( RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program") );
rtl::Bootstrap::expandMacros(path1);
rtl::OString path2;
if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) ==
diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp
index 7d531e7..8521a2c 100644
--- a/crashrep/source/win32/soreport.cpp
+++ b/crashrep/source/win32/soreport.cpp
@@ -179,7 +179,7 @@ static FILE *_tmpfile(void)
static BOOL GetCrashDataPath( LPTSTR szBuffer )
{
- ::rtl::OUString ustrValue = ::rtl::OUString::createFromAscii("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}");
+ ::rtl::OUString ustrValue = ::rtl::OUString::createFromAscii("${$OOO_BASE_DIR/program/bootstrap.ini:UserInstallation}");
::rtl::Bootstrap::expandMacros( ustrValue );
if ( ustrValue.getLength() )
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index b76deb2..3b586d0 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -71,7 +71,7 @@
#define NOTICE_FILE "NOTICE" FILE_EXTENSION
// Dir where the files are located
-#define BRAND_DIR_SHARE_README "${BRAND_BASE_DIR}/share/readme/"
+#define OOO_DIR_SHARE_README "${OOO_BASE_DIR}/share/readme/"
using namespace com::sun::star;
@@ -219,13 +219,13 @@ namespace
maTabCtrl.Show();
// Notice and License are not localized
- const rtl::OUString sLicense( RTL_CONSTASCII_USTRINGPARAM( BRAND_DIR_SHARE_README LICENSE_FILE ) );
- const rtl::OUString sNotice( RTL_CONSTASCII_USTRINGPARAM( BRAND_DIR_SHARE_README NOTICE_FILE ) );
+ const rtl::OUString sLicense( RTL_CONSTASCII_USTRINGPARAM( OOO_DIR_SHARE_README LICENSE_FILE ) );
+ const rtl::OUString sNotice( RTL_CONSTASCII_USTRINGPARAM( OOO_DIR_SHARE_README NOTICE_FILE ) );
// get localized README
rtl::OUStringBuffer aBuff;
lang::Locale aLocale = Application::GetSettings().GetUILocale();
- aBuff.appendAscii( RTL_CONSTASCII_STRINGPARAM( BRAND_DIR_SHARE_README README_FILE "_" ) );
+ aBuff.appendAscii( RTL_CONSTASCII_STRINGPARAM( OOO_DIR_SHARE_README README_FILE "_" ) );
aBuff.append( aLocale.Language );
if ( aLocale.Country.getLength() )
{
@@ -350,6 +350,7 @@ void AboutDialog::ApplyStyleSettings()
Color aWindowColor( rSettings.GetWindowColor() );
Wallpaper aWall( aWindowColor );
SetBackground( aWall );
+
Font aNewFont( maCopyrightEdit.GetFont() );
aNewFont.SetTransparent( sal_True );
@@ -517,6 +518,13 @@ sal_Bool AboutDialog::Close()
void AboutDialog::Paint( const Rectangle& rRect )
{
SetClipRegion( rRect );
+
+ // workaround to ensure that the background is painted correct
+ // on MacOS for exmaple the background was grey and the image and other controls white
+ SetFillColor(GetSettings().GetStyleSettings().GetWindowColor());
+ SetLineColor();
+ DrawRect(rRect);
+
DrawImage( maMainLogoPos, maMainLogo );
DrawImage( maAppLogoPos, maAppLogo );
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index c8d1bfa..c562b54 100644
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -81,21 +81,20 @@ for sd_arg in "$@"; do
;;
esac
done
-"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \
+"$sd_prog/pagein" -L"$sd_prog" \
${sd_pagein_args}
# extend the ld_library_path for java: javaldx checks the sofficerc for us
-if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
+if [ -x "$sd_prog/javaldx" ] ; then
# this is a temporary hack until we can live with the default search paths
case "`uname -s`" in
FreeBSD)
- sd_prog1="$sd_prog/../basis-link/program"
- sd_prog2="$sd_prog/../basis-link/ure-link/lib"
- LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
+ sd_prog1="$sd_prog"
+ LD_LIBRARY_PATH=$sd_prog1:${LD_LIBRARY_PATH}}
export LD_LIBRARY_PATH
;;
esac
- my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
+ my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then
LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 3128be3..e010f12 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -589,7 +589,7 @@ static bool needsSynchronization(
static ::rtl::OUString getBrandSharePreregBundledPathURL()
{
::rtl::OUString url(
- RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/share/prereg/bundled"));
+ RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/share/prereg/bundled"));
::rtl::Bootstrap::expandMacros(url);
return url;
@@ -883,7 +883,7 @@ static bool needsInstallBundledExtensionBlobs (
// install bundled but non-pre-registered extension blobs
static void installBundledExtensionBlobs()
{
- rtl::OUString aDirUrl( OUSTR("$BRAND_BASE_DIR/share/extensions/install"));
+ rtl::OUString aDirUrl( OUSTR("$OOO_BASE_DIR/share/extensions/install"));
::rtl::Bootstrap::expandMacros( aDirUrl);
::osl::Directory aDir( aDirUrl);
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index c08b73c..f2e5ca3 100644
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.cxx
@@ -61,7 +61,7 @@ OUString Desktop::GetLicensePath()
if (aLicensePath.getLength() > 0)
return aLicensePath;
- OUString aBaseInstallPath(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR"));
+ OUString aBaseInstallPath(RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR"));
rtl::Bootstrap::expandMacros(aBaseInstallPath);
// determine the filename of the license to show
diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx
index db99dc6..69cea69 100644
--- a/desktop/source/deployment/misc/dp_update.cxx
+++ b/desktop/source/deployment/misc/dp_update.cxx
@@ -237,7 +237,7 @@ OUString getExtensionDefaultUpdateURL()
{
::rtl::OUString sUrl(
RTL_CONSTASCII_USTRINGPARAM(
- "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version")
+ "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version")
":Version:ExtensionUpdateURL}"));
::rtl::Bootstrap::expandMacros(sUrl);
return sUrl;
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index cf3bcf4..f4642dd 100755
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -197,10 +197,10 @@ BackendImpl::BackendImpl(
{
OUString basic_path(
m_eContext == CONTEXT_USER
- ? OUSTR("vnd.sun.star.expand:${$BRAND_BASE_DIR/program/"
+ ? OUSTR("vnd.sun.star.expand:${$OOO_BASE_DIR/program/"
SAL_CONFIGFILE("bootstrap")
":UserInstallation}/user/basic")
- : OUSTR("vnd.sun.star.expand:${$BRAND_BASE_DIR/program/"
+ : OUSTR("vnd.sun.star.expand:${$OOO_BASE_DIR/program/"
SAL_CONFIGFILE("bootstrap")
":BaseInstallation}/share/basic") );
m_basic_script_libs.reset(
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index d67ca59..d7ec7fe 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -391,10 +391,10 @@ extern "C" int unopkg_main()
//bootstrapped. Otherwies files could be locked by this process.
//If there is no folder left in
- //$BRAND_BASE_DIR/share/extensions
+ //$OOO_BASE_DIR/share/extensions
//then we can delete the registration data at
//$BUNDLED_EXTENSIONS_USER
- if (hasNoFolder(OUSTR("$BRAND_BASE_DIR/share/extensions")))
+ if (hasNoFolder(OUSTR("$OOO_BASE_DIR/share/extensions")))
{
removeFolder(OUSTR("$BUNDLED_EXTENSIONS_PREREG"));
//return otherwise we create the registration data again
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index f8fdd9f..8e63a5c 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -451,7 +451,7 @@ Reference<XComponentContext> connectToOffice(
OUString getLockFilePath()
{
OUString ret;
- OUString sBootstrap(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}"));
+ OUString sBootstrap(RTL_CONSTASCII_USTRINGPARAM("${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}"));
rtl::Bootstrap::expandMacros(sBootstrap);
OUString sAbs;
if (::osl::File::E_None == ::osl::File::getAbsoluteFileURL(
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 909b206..7546e3e 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -279,7 +279,7 @@ OUString implReadBootstrapKey( const OUString& _rKey )
OUString sValue(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "${.override:${BRAND_BASE_DIR}/program/edition/edition.ini:")) +
+ "${.override:${OOO_BASE_DIR}/program/edition/edition.ini:")) +
_rKey + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("}")));
rtl::Bootstrap::expandMacros(sValue);
return sValue;
@@ -391,7 +391,7 @@ void SplashScreen::initBitmap()
{
OUString sExecutePath;
::rtl::Bootstrap::get(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ),
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "OOO_BASE_DIR" ) ),
sExecutePath );
sExecutePath += OUString( RTL_CONSTASCII_USTRINGPARAM( "/program/" ) );
@@ -410,7 +410,7 @@ void SplashScreen::initBitmap()
rtl::OUString edition(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "${BRAND_BASE_DIR}/program/edition")));
+ "${OOO_BASE_DIR}/program/edition")));
rtl::Bootstrap::expandMacros(edition);
haveBitmap = findBitmap(edition);
}
diff --git a/desktop/win32/source/extendloaderenvironment.cxx b/desktop/win32/source/extendloaderenvironment.cxx
index 42260fa..6dd656f 100644
--- a/desktop/win32/source/extendloaderenvironment.cxx
+++ b/desktop/win32/source/extendloaderenvironment.cxx
@@ -145,18 +145,19 @@ void extendLoaderEnvironment(WCHAR * binPath, WCHAR * iniDirectory) {
exclude1 = true;
}
WCHAR * pad2 = exclude1 ? pad : padEnd + 1;
- pathEnd = tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link"));
+// pathEnd = tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link"));
+ pathEnd = tools::buildPath(path, path, pathEnd, MY_STRING(L""));
if (pathEnd == NULL) {
fail();
}
- pathEnd = tools::resolveLink(path);
- if (pathEnd == NULL) {
- fail();
- }
- padEnd = tools::buildPath(pad2, path, pathEnd, MY_STRING(L"\\bin"));
- if (padEnd == NULL) {
- fail();
- }
+ // pathEnd = tools::resolveLink(path);
+ // if (pathEnd == NULL) {
+ // fail();
+ // }
+ // padEnd = tools::buildPath(pad2, path, pathEnd, MY_STRING(L"\\bin"));
+ // if (padEnd == NULL) {
+ // fail();
+ // }
bool exclude2 = contains(env, pad2, padEnd);
if (!(exclude1 && exclude2)) {
if (!(exclude1 || exclude2)) {
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 58f180d..642d794 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -120,7 +120,7 @@ static inline rtl::OUString getBuildId()
//------------------------------------------------------------------------------
static inline rtl::OUString getBaseInstallation()
{
- rtl::OUString aPathVal(UNISTRING("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":BaseInstallation}"));
+ rtl::OUString aPathVal(UNISTRING("${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":BaseInstallation}"));
rtl::Bootstrap::expandMacros(aPathVal);
return aPathVal;
}
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index e73dc33..b9a2eee 100755
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -66,12 +66,12 @@ getBootstrapData(
if ( ! rBuildID.getLength() )
return false;
- rInstallSetID = UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateID}" );
+ rInstallSetID = UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateID}" );
rtl::Bootstrap::expandMacros( rInstallSetID );
if ( ! rInstallSetID.getLength() )
return false;
- rtl::OUString aValue( UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateURL}" ) );
+ rtl::OUString aValue( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateURL}" ) );
rtl::Bootstrap::expandMacros( aValue );
if( aValue.getLength() > 0 )
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 06b8d3d..2355d5b 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -357,7 +357,7 @@ UpdateInformationProvider::UpdateInformationProvider(
UNISTRING("ooSetupVersion")));
rtl::OUString edition(
UNISTRING(
- "${${BRAND_BASE_DIR}/program/edition/edition.ini:"
+ "${${OOO_BASE_DIR}/program/edition/edition.ini:"
"EDITIONNAME}"));
rtl::Bootstrap::expandMacros(edition);
if (edition.getLength() != 0) {
@@ -378,10 +378,11 @@ UpdateInformationProvider::UpdateInformationProvider(
rtl::OUString aBaseBuildId( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) );
rtl::Bootstrap::expandMacros( aBaseBuildId );
- rtl::OUString aBrandBuildId( UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) );
- rtl::Bootstrap::expandMacros( aBrandBuildId );
+ rtl::OUString aBrandBuildId(aBaseBuildId);
+ // rtl::OUString aBrandBuildId( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) );
+ // rtl::Bootstrap::expandMacros( aBrandBuildId );
- rtl::OUString aUserAgent( UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateUserAgent}" ) );
+ rtl::OUString aUserAgent( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateUserAgent}" ) );
rtl::Bootstrap::expandMacros( aUserAgent );
if ( ! aBaseBuildId.equals( aBrandBuildId ) )
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index 1144100..2ba2f03 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -5306,7 +5306,7 @@ sal_Bool OCX_Image::Read(SotStorageStream *pS)
pS->Seek( imagePos );
- sImageUrl = C2U("vnd.sun.star.expand:${$BRAND_BASE_DIR/program/") + C2U( SAL_CONFIGFILE( "bootstrap" ) ) + C2U("::UserInstallation}/user/temp/") + sName;
+ sImageUrl = C2U("vnd.sun.star.expand:${$OOO_BASE_DIR/program/") + C2U( SAL_CONFIGFILE( "bootstrap" ) ) + C2U("::UserInstallation}/user/temp/") + sName;
sal_uInt8* pImage = new sal_uInt8[ nImageLen ];
pS->Read(pImage, nImageLen);
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 190fd3b..c4debde 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -1242,7 +1242,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_TEMP ] = ConvertOSLtoUCBURL( aTmp );
aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR"));
+ RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR"));
rtl::Bootstrap::expandMacros(
aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL]);
}
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 3472278..a4839dd 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -82,7 +82,8 @@ ALLTAR : $(LOCALPYFILES)
.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
ALLTAR : openoffice
.ELSE
-ALLTAR : openoffice sdkoo_en-US ure_en-US
+ALLTAR : openoffice sdkoo_en-US
+#ALLTAR : openoffice sdkoo_en-US ure_en-US
.ENDIF
.ELSE # "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
ALLTAR : updatepack
@@ -138,24 +139,24 @@ sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i)
sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
-ure: $(foreach,i,$(alllangiso) ure_$i)
+#ure: $(foreach,i,$(alllangiso) ure_$i)
MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates
MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
-MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates
+#MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates
MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates
.IF "$(BUILD_SPECIAL)"!=""
MSIOFFICETEMPLATEDIR=$(MSIOFFICETEMPLATESOURCE)
MSILANGPACKTEMPLATEDIR=$(MSILANGPACKTEMPLATESOURCE)
-MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE)
+#MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE)
MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE)
.ELSE # "$(BUILD_SPECIAL)"!=""
NOLOGOSPLASH:=$(BIN)$/intro.zip
DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip
MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates
MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates
-MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates
+#MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates
MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH)
@@ -179,7 +180,7 @@ $(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
-$(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
+#$(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
.IF "$(MAKETARGETS)"!=""
$(MAKETARGETS) : $(ADDDEPS)
@@ -223,16 +224,16 @@ $(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
sdkoodev_%{$(PKGFORMAT:^".")} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
-$(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
-ure_%{$(PKGFORMAT:^".")} :
-.IF "$(OS)" == "MACOSX"
- @echo 'for now, there is no standalone URE for Mac OS X'
-.ELSE
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst \
- -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p URE -u $(OUT) -buildid $(BUILD) -format $(@:e:s/.//) $(VERBOSESWITCH) \
- -msitemplate $(MSIURETEMPLATEDIR) \
- -msilanguage $(MISC)$/win_ulffiles
-.ENDIF
+#$(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
+#ure_%{$(PKGFORMAT:^".")} :
+#.IF "$(OS)" == "MACOSX"
+# @echo 'for now, there is no standalone URE for Mac OS X'
+#.ELSE
+# $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.#lst \
+# -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p URE -u $(OUT) -buildid $(BUILD) -#format $(@:e:s/.//) $(VERBOSESWITCH) \
+# -msitemplate $(MSIURETEMPLATEDIR) \
+# -msilanguage $(MISC)$/win_ulffiles
+#.ENDIF
.IF "$(MAKETARGETS)"!=""
.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
@@ -254,37 +255,39 @@ $(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewi
$(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
@$(COPY) $< $@
-$(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_nologo$/intro.zip
+#$(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_nologo$/intro.zip
+$(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/intro.zip
$(COPY) $< $@
-$(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_dev_nologo$/intro.zip
+#$(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_dev_nologo$/intro.zip
+$(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_dev$/intro.zip
@-$(MKDIR) $(@:d)
$(COPY) $< $@
hack_msitemplates .PHONY:
-$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)
-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)
- -$(MKDIRHIER) $(MSIURETEMPLATEDIR)
+# -$(MKDIRHIER) $(MSIURETEMPLATEDIR)
-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
-$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)$/Binary
-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary
- -$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary
+# -$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary
-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary
$(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
$(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
- $(GNUCOPY) $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR)
+# $(GNUCOPY) $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR)
$(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
$(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary
$(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary
- $(GNUCOPY) $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary
+# $(GNUCOPY) $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary
$(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary
$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
- $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+# $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+# $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index fe244c7..ed2fd0f 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -35,6 +35,24 @@ GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
.END
my_components = \
+ acceptor \
+ binaryurp \
+ bootstrap \
+ connector \
+ introspection \
+ invocadapt \
+ invocation \
+ javaloader \
+ javavm \
+ juh \
+ namingservice \
+ proxyfac \
+ reflection \
+ stocservices \
+ streams \
+ textinstream \
+ textoutstream \
+ uuresolver \
abp \
adabasui \
analysis \
@@ -110,6 +128,7 @@ my_components = \
lnth \
localebe1 \
log \
+ mailmerge \
mcnttype \
migrationoo2 \
msfilter \
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 3241f7f..52e165b 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -63,15 +63,15 @@ MY_FILES_base = \
$(MY_MOD)/org/openoffice/Office/Common-base.xcu \
$(MY_MOD)/org/openoffice/Setup-base.xcu
-MY_FILES_brand = \
- $(MY_XCU)/Office/Compatibility.xcu \
- $(MY_MOD)/org/openoffice/Office/Common-brand.xcu \
- $(MY_MOD)/org/openoffice/Office/UI-brand.xcu \
- $(MY_MOD)/org/openoffice/Setup-brand.xcu
-.IF "$(ENABLE_SVCTAGS)" == "YES"
-MY_FILES_brand += \
- $(MY_MOD)/org/openoffice/Office/Jobs/Jobs-registration.xcu
-.END
+#MY_FILES_brand = \
+# $(MY_XCU)/Office/Compatibility.xcu \
+# $(MY_MOD)/org/openoffice/Office/Common-brand.xcu \
+# $(MY_MOD)/org/openoffice/Office/UI-brand.xcu \
+# $(MY_MOD)/org/openoffice/Setup-brand.xcu
+#.IF "$(ENABLE_SVCTAGS)" == "YES"
+#MY_FILES_brand += \
+# $(MY_MOD)/org/openoffice/Office/Jobs/Jobs-registration.xcu
+#.END
MY_DEPS_calc = main
MY_FILES_calc = \
@@ -230,6 +230,7 @@ MY_FILES_main = \
$(MY_XCU)/Office/Calc.xcu \
$(MY_XCU)/Office/Canvas.xcu \
$(MY_XCU)/Office/Common.xcu \
+ $(MY_XCU)/Office/Compatibility.xcu \
$(MY_XCU)/Office/DataAccess.xcu \
$(MY_XCU)/Office/Embedding.xcu \
$(MY_XCU)/Office/ExtensionDependencies.xcu \
@@ -289,13 +290,20 @@ MY_FILES_main = \
$(MY_MOD)/fcfg_chart_types.xcu \
$(MY_MOD)/fcfg_internalgraphics_filters.xcu \
$(MY_MOD)/fcfg_internalgraphics_types.xcu \
+ $(MY_MOD)/org/openoffice/Office/Common-brand.xcu \
$(MY_MOD)/org/openoffice/Office/Embedding-chart.xcu \
+ $(MY_MOD)/org/openoffice/Office/UI-brand.xcu \
+ $(MY_MOD)/org/openoffice/Setup-brand.xcu \
$(MY_MOD)/org/openoffice/Setup-start.xcu \
$(MY_MOD)/org/openoffice/TypeDetection/UISort-calc.xcu \
$(MY_MOD)/org/openoffice/TypeDetection/UISort-draw.xcu \
$(MY_MOD)/org/openoffice/TypeDetection/UISort-impress.xcu \
$(MY_MOD)/org/openoffice/TypeDetection/UISort-math.xcu \
$(MY_MOD)/org/openoffice/TypeDetection/UISort-writer.xcu
+.IF "$(ENABLE_SVCTAGS)" == "YES"
+MY_FILES_main += \
+ $(MY_MOD)/org/openoffice/Office/Jobs/Jobs-registration.xcu
+.END
.IF "$(GUIBASE)" == "aqua"
MY_FILES_main += \
$(MY_MOD)/DataAccess/macab.xcu \
diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c
index d6852e0..9a0ce70 100644
--- a/sal/osl/unx/signal.c
+++ b/sal/osl/unx/signal.c
@@ -737,7 +737,7 @@ static int ReportCrash( int Signal )
rtl_string2UString(
&crashrep_url,
RTL_CONSTASCII_USTRINGPARAM(
- "$BRAND_BASE_DIR/program/crashrep"),
+ "$OOO_BASE_DIR/program/crashrep"),
OSTRING_TO_OUSTRING_CVTFLAGS);
rtl_bootstrap_expandMacros(&crashrep_url);
osl_getSystemPathFromFileURL(crashrep_url, &crashrep_path);
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 64bb554..2e50655 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -43,8 +43,8 @@ Module gid_Module_Root_Brand
gid_Brand_Dir_Share_Uno_Packages_Cache,
gid_Brand_Dir_Share_Registry,
gid_Brand_Dir_Share_Xdg);
- Files = (gid_Brand_File_BasisLink,
- gid_Brand_File_Bin_Crashreport,
+ // Files = (gid_Brand_File_BasisLink,
+ Files = (gid_Brand_File_Bin_Crashreport,
gid_Brand_File_Bin_Crashreport_Script,
gid_Brand_File_Bin_Crashreport_Com,
gid_Brand_File_Bin_Python,
@@ -73,8 +73,8 @@ Module gid_Module_Root_Brand
gid_Brand_File_Lib_Oirm2,
gid_Brand_File_Msvcm80crt_Manifest,
gid_Brand_File_Lib_Npsoplugin,
- gid_Brand_File_ServicesRdb,
- gid_Brand_File_Share_Registry_Brand_Xcd,
+// gid_Brand_File_ServicesRdb,
+// gid_Brand_File_Share_Registry_Brand_Xcd,
gid_Brand_File_Share_Registry_O5oo_Xcd,
gid_Brand_File_Script_Unopkg,
gid_Brand_File_Share_Xdg_Base,
@@ -89,10 +89,12 @@ Module gid_Module_Root_Brand
gid_Brand_File_Share_Xdg_StartCenter,
gid_Brand_File_Share_Xdg_Writer,
gid_Brand_File_Txt_Package);
- Unixlinks = (gid_Brand_Unixlink_BasisLink,
- gid_Brand_Unixlink_Program,
- gid_Brand_Unixlink_Unopkg,
- gid_Brand_Unixlink_Urelibs);
+ Unixlinks = (gid_Brand_Unixlink_Program,
+ gid_Brand_Unixlink_Unopkg);
+// Unixlinks = (gid_Brand_Unixlink_BasisLink,
+// gid_Brand_Unixlink_Program,
+// gid_Brand_Unixlink_Unopkg,
+// gid_Brand_Unixlink_Urelibs);
End
// Language specific brand module
@@ -139,7 +141,7 @@ End
Directory gid_Brand_Dir_Readme
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Dir_Bundle_Contents;
#else
ParentID = gid_Dir_Brand_Root;
#endif
@@ -148,7 +150,7 @@ End
Directory gid_Brand_Dir_License
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Dir_Bundle_Contents;
#else
ParentID = gid_Dir_Brand_Root;
#endif
@@ -246,28 +248,29 @@ End
// Link to basis
-#if defined(WNT) || defined(OS2)
-File gid_Brand_File_BasisLink
- TXT_FILE_BODY;
- Dir = gid_Dir_Brand_Root;
- Name = "basis-link";
- Styles = (PACKED);
-End
-#elif defined MACOSX
-Directory gid_Brand_Dir_BasisLink
- ParentID = gid_Dir_Bundle_Contents;
- DosName = "basis-link";
-End
-#else
-Unixlink gid_Brand_Unixlink_BasisLink
- BIN_FILE_BODY;
- Styles = ();
- // Styles = (LAYERLINK);
- Name = "basis-link";
- Dir = gid_Dir_Brand_Root;
- Target = "../${UNIXBASISROOTNAME}/basis${OOOBASEVERSION}";
-End
-#endif
+//#if defined(WNT) || defined(OS2)
+//File gid_Brand_File_BasisLink
+// TXT_FILE_BODY;
+// Dir = gid_Dir_Brand_Root;
+// Name = "basis-link";
+// Styles = (PACKED);
+//End
+//#elif defined MACOSX
+//Directory gid_Brand_Dir_BasisLink
+// ParentID = gid_Dir_Bundle_Contents;
+// DosName = "";
+//// DosName = "basis-link";
+//End
+//#else
+//Unixlink gid_Brand_Unixlink_BasisLink
+// BIN_FILE_BODY;
+// Styles = ();
+// // Styles = (LAYERLINK);
+// Name = "basis-link";
+// Dir = gid_Dir_Brand_Root;
+// Target = "../${UNIXBASISROOTNAME}/basis${OOOBASEVERSION}";
+//End
+//#endif
// UnixLinks
@@ -473,12 +476,12 @@ File gid_Brand_File_Txt_Package
Styles = (PACKED);
End
-File gid_Brand_File_Share_Registry_Brand_Xcd
- TXT_FILE_BODY;
- Styles = (PACKED, SCPZIP_REPLACE);
- Dir = gid_Brand_Dir_Share_Registry;
- Name = "brand.xcd";
-End
+#File gid_Brand_File_Share_Registry_Brand_Xcd
+# TXT_FILE_BODY;
+# Styles = (PACKED, SCPZIP_REPLACE);
+# Dir = gid_Brand_Dir_Share_Registry;
+# Name = "brand.xcd";
+#End
File gid_Brand_File_Share_Registry_Cjk_Xcd
TXT_FILE_BODY;
@@ -723,11 +726,13 @@ Profile gid_Brand_Profile_Version_Ini
Styles = (NETWORK);
End
+#ifdef JSC
Profile gid_Brand_Profile_Fundamental_Ini
ModuleID = gid_Module_Root_Brand;
Name = PROFILENAME(fundamental);
Dir = gid_Brand_Dir_Program;
End
+#endif
#if !defined MACOSX
Profile gid_Brand_Profile_Redirect_Ini
@@ -1025,6 +1030,15 @@ ProfileItem gid_Brand_Profileitem_Version_Ooobaseversion
Value = "${OOOBASEVERSION}";
End
+ProfileItem gid_Brand_Profileitem_Version_Ooopackageversion
+ ProfileID = gid_Brand_Profile_Version_Ini;
+ ModuleID = gid_Module_Root_Brand;
+ Section = "Version";
+ Order = 18;
+ Key = "OOOPackageVersion";
+ Value = "${OOOPACKAGEVERSION}";
+End
+
ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl
ProfileID = gid_Brand_Profile_Version_Ini;
ModuleID = gid_Module_Root_Brand;
@@ -1034,6 +1048,8 @@ ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl
Value = "http://updateexte.services.openoffice.org/ExtensionUpdateService/check.Update";
End
+#ifdef JSC
+
ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir
ModuleID = gid_Module_Root_Brand;
ProfileID = gid_Brand_Profile_Fundamental_Ini;
@@ -1048,9 +1064,11 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ooo_Base_Dir
Section = "Bootstrap";
Key = "OOO_BASE_DIR";
#if defined(WNT) || defined(OS2)
- Value = "${.link:${BRAND_BASE_DIR}/basis-link}";
+ Value = "${BRAND_BASE_DIR}";
+// Value = "${.link:${BRAND_BASE_DIR}/basis-link}";
#else
- Value = "${BRAND_BASE_DIR}/basis-link";
+ Value = "${BRAND_BASE_DIR}";
+// Value = "${BRAND_BASE_DIR}/basis-link";
#endif
End
@@ -1182,6 +1200,8 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Lib_Dir
Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_LIB_DIR}";
End
+#endif # JSC
+
#if !defined MACOSX
ProfileItem gid_Brand_Profileitem_Redirect_Ure_Bootstrap
ModuleID = gid_Module_Root_Brand;
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 389351e..288c87a 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -69,36 +69,47 @@ End
Directory gid_Dir_Ooo_Openofficeorg
ParentID = PREDEFINED_PROGDIR;
#if defined(WNT) || defined(OS2)
- HostName = "${BASISROOTNAME}";
+ HostName = "${PRODUCTNAME} ${BRANDPACKAGEVERSION}";
#else
- HostName = "${UNIXBASISROOTNAME}";
+ HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";
#endif
+// ParentID = PREDEFINED_PROGDIR;
+// #if defined(WNT) || defined(OS2)
+// HostName = "${BASISROOTNAME}";
+// #else
+// HostName = "${UNIXBASISROOTNAME}";
+// #endif
End
#endif
#ifndef MACOSX
Directory gid_Dir_Ooo_Basis
- #if defined(WNT) || defined(OS2)
- ParentID = gid_Dir_Brand_Root;
- #else
ParentID = gid_Dir_Ooo_Openofficeorg;
- #endif
- #if defined(WNT) || defined(OS2)
- HostName = "Basis";
- #else
- HostName = "basis${OOOBASEVERSION}";
- #endif
+ HostName = "";
Styles = (BASISDIRECTORY);
+// #if defined(WNT) || defined(OS2)
+// ParentID = gid_Dir_Brand_Root;
+// #else
+// ParentID = gid_Dir_Ooo_Openofficeorg;
+// #endif
+// #if defined(WNT) || defined(OS2)
+// HostName = "";
+// #else
+// HostName = "basis${OOOBASEVERSION}";
+// #endif
+// Styles = (BASISDIRECTORY);
End
#endif
Directory gid_Dir_Program
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Brand_Dir_Program;
+// ParentID = gid_Brand_Dir_BasisLink;
#else
- ParentID = gid_Dir_Ooo_Basis;
+ ParentID = gid_Brand_Dir_Program;
+// ParentID = gid_Dir_Ooo_Basis;
#endif
- DosName = "program";
+ DosName = "";
End
#if defined MACOSX
@@ -163,7 +174,7 @@ End
Directory gid_Dir_User
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Dir_Bundle_Contents;
#else
ParentID = gid_Dir_Ooo_Basis;
#endif
@@ -342,7 +353,7 @@ End
Directory gid_Dir_Share
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Dir_Bundle_Contents;
#else
ParentID = gid_Dir_Ooo_Basis;
#endif
@@ -1236,18 +1247,26 @@ Directory gid_Dir_Share_Fingerprint
DosName = "fingerprint";
End
+
+#ifndef MACOSX
Directory gid_Dir_Basis_Sdk
-#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
-#else
ParentID = gid_Dir_Ooo_Basis;
-#endif
DosName = "sdk";
End
+#endif
+
+//Directory gid_Dir_Basis_Sdk
+//#if defined MACOSX
+// ParentID = gid_Brand_Dir_BasisLink;
+//#else
+// ParentID = gid_Dir_Ooo_Basis;
+//#endif
+// DosName = "sdk";
+//End
Directory gid_Dir_Help
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Dir_Bundle_Contents;
#else
ParentID = gid_Dir_Ooo_Basis;
#endif
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index ac313ed..49f29b2 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1129,7 +1129,8 @@ File gid_File_Rdb_Offapi
TXT_FILE_BODY;
Dir = gid_Dir_Program;
Styles = (PACKED);
- Name = "offapi.rdb";
+ Name = "types.rdb";
+// Name = "offapi.rdb";
End
File gid_File_Rdb_TypesVba
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index dd1559c..0e219ef 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -348,10 +348,12 @@ PARFILES= \
profileitem_ooo.par \
ure.par \
ure_into_ooo.par \
- ure_standalone.par \
+ ure_standalone.par \
+ common_brand.par \
common_brand.par \
common_brand_readme.par \
- ooo_brand.par
+ ooo_brand.par
+
.IF "$(GUI)"=="WNT"
PARFILES += \
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
index 27cb37a..fc617ad 100644
--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@@ -53,12 +53,12 @@ File gid_File_Txt_License_Root
Styles = (PACKED);
End
-File gid_Brand_File_ServicesRdb
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "/ooo/services.rdb";
- Styles = (PACKED);
-End
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list