summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--desktop/source/app/dispatchwatcher.cxx7
-rw-r--r--desktop/source/migration/pages.cxx23
-rw-r--r--desktop/source/migration/wizard.hrc6
-rw-r--r--desktop/source/migration/wizard.src18
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Common.xcu9
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Paths.xcu9
-rw-r--r--officecfg/registry/data/org/openoffice/Office/makefile.mk2
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Common.xcs3
-rw-r--r--sfx2/source/doc/docfile.cxx16
-rw-r--r--sfx2/source/doc/doctemplates.cxx10
-rw-r--r--sfx2/source/doc/graphhelp.cxx27
-rw-r--r--uui/source/masterpassworddlg.src8
-rw-r--r--uui/source/passcrtdlg.cxx3
-rw-r--r--uui/source/passcrtdlg.hrc1
-rw-r--r--uui/source/passcrtdlg.src2
-rw-r--r--uui/source/passworddlg.hrc20
-rw-r--r--uui/source/passworddlg.src2
17 files changed, 70 insertions, 96 deletions
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 0c6de1db2225..c1dd167ea39a 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -122,7 +122,7 @@ DispatchWatcher* DispatchWatcher::GetDispatchWatcher()
DispatchWatcher::DispatchWatcher()
- : m_nRequestCount(1)
+ : m_nRequestCount(0)
{
}
@@ -437,12 +437,13 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
}
::osl::ClearableMutexGuard aGuard( GetMutex() );
- m_nRequestCount--;
+ bool bEmpty = (m_nRequestCount == 0);
+ aGuard.clear();
// No more asynchronous requests?
// The requests are removed from the request container after they called back to this
// implementation via statusChanged!!
- if ( !m_nRequestCount && ! bNoTerminate /*m_aRequestContainer.empty()*/ )
+ if ( bEmpty && !bNoTerminate /*m_aRequestContainer.empty()*/ )
{
// We have to check if we have an open task otherwise we have to shutdown the office.
Reference< XFramesSupplier > xTasksSupplier( xDesktop, UNO_QUERY );
diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx
index 0122caba945e..80c5849ee4d9 100644
--- a/desktop/source/migration/pages.cxx
+++ b/desktop/source/migration/pages.cxx
@@ -100,9 +100,10 @@ WelcomePage::WelcomePage( svt::OWizardMachine* parent, const ResId& resid, sal_B
// we need to choose the welcome text that is diplayed
// choices are the default text, default text+migradtion,
// OEM and extended OEM
- switch (checkOEM())
- {
- case OEM_NONE:
+ // No OEM is built, remove the check
+// switch (checkOEM())
+// {
+// case OEM_NONE:
// check for migration
if (Migration::checkMigration())
{
@@ -112,27 +113,11 @@ WelcomePage::WelcomePage( svt::OWizardMachine* parent, const ResId& resid, sal_B
m_ftBody.SetText( aText );
}
else
- if (bIsEvalVersion && (! bNoEvalText))
- {
- String aText(WizardResId(STR_WELCOME_EVAL));
- aText.SearchAndReplaceAll( UniString::CreateFromAscii("%EVALDAYS"), UniString::CreateFromAscii("90"));
- m_ftBody.SetText( aText );
- }
- else
if ( ! m_bLicenseNeedsAcceptance )
{
String aText(WizardResId(STR_WELCOME_WITHOUT_LICENSE));
m_ftBody.SetText( aText );
}
- break;
- case OEM_NORMAL:
- m_ftBody.SetText(String(WizardResId(STR_WELCOME_OEM)));
- break;
- case OEM_EXTENDED:
- m_ftBody.SetText(String(WizardResId(STR_WELCOME_OEM_EXT)));
- break;
- }
-
}
diff --git a/desktop/source/migration/wizard.hrc b/desktop/source/migration/wizard.hrc
index 317465736f6e..cdd045164123 100644
--- a/desktop/source/migration/wizard.hrc
+++ b/desktop/source/migration/wizard.hrc
@@ -88,13 +88,13 @@
#define STR_STATE_MIGRATION RID_FIRSTSTSTART_START+102
#define STR_STATE_REGISTRATION RID_FIRSTSTSTART_START+103
#define STR_WELCOME_MIGRATION RID_FIRSTSTSTART_START+104
-#define STR_WELCOME_OEM RID_FIRSTSTSTART_START+105
-#define STR_WELCOME_OEM_EXT RID_FIRSTSTSTART_START+106
+// FREE RID_FIRSTSTSTART_START+105
+// FREE RID_FIRSTSTSTART_START+106
#define STR_LICENSE_ACCEPT RID_FIRSTSTSTART_START+107
#define STR_LICENSE_DECLINE RID_FIRSTSTSTART_START+108
#define STR_FINISH RID_FIRSTSTSTART_START+109
#define STR_STATE_USER RID_FIRSTSTSTART_START+110
-#define STR_WELCOME_EVAL RID_FIRSTSTSTART_START+111
+// FREE RID_FIRSTSTSTART_START+111
#define STR_STATE_UPDATE_CHECK RID_FIRSTSTSTART_START+112
#define STR_WELCOME_WITHOUT_LICENSE RID_FIRSTSTSTART_START+113
#define STR_REGISTRATION_OOO RID_FIRSTSTSTART_START+114
diff --git a/desktop/source/migration/wizard.src b/desktop/source/migration/wizard.src
index 3b49e070fa6d..634c8fe12dcb 100644
--- a/desktop/source/migration/wizard.src
+++ b/desktop/source/migration/wizard.src
@@ -79,24 +79,6 @@ String STR_WELCOME_MIGRATION
Text [ en-US ] = "This wizard will guide you through the license agreement, the transfer of user data from %OLD_VERSION and the registration of %PRODUCTNAME.\n\nClick 'Next' to continue.";
};
-String STR_WELCOME_OEM
-{
- Text [ en-US ] = "This wizard will guide you through the license agreement and the registration of %PRODUCTNAME.\n\nImportant information is contained in the readme file which is located in the %PRODUCTNAME product directory. Please read this file carefully.\n\nYou can also find detailed information on the Sun Internet pages at\n\nhttp://www.sun.com/%PRODUCTNAME.\n\nClick 'Next' to continue.";
-};
-String STR_WELCOME_OEM_EXT
-{
- Text [ en-US ] = "This wizard will guide you through the license agreement and the registration of %PRODUCTNAME.\n\n"
- "Important information is contained in the readme files which are located in the %PRODUCTNAME product directory. "
- "Please read these files carefully. You can also find detailed information on the Sun website \n\n"
- "http://www.sun.com/%PRODUCTNAME.\n\nSupport:\n\nGet FREE software support valid for 60 days from "
- "date of purchase. To take advantage of this offer, visit the website below.\n\n"
- "http://www.sun.com/star/service\n\nClick 'Next' to continue.";
-};
-
-String STR_WELCOME_EVAL
-{
- Text [ en-US ] = "This wizard will guide you through the license agreement and the registration of %PRODUCTNAME.\n\nThis version lets you evaluate the full functionality. However, since it is an evaluation version, you will be able to start it within %EVALDAYS days after installation. To find out more about the %PRODUCTNAME product, visit www.sun.com/%PRODUCTNAME\n\nClick 'Next' to continue.";
-};
String STR_WELCOME_WITHOUT_LICENSE
{
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 6e25dedba37e..c9747dc9dea0 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -567,4 +567,13 @@
</prop>
</node>
</node>
+ <node oor:name="Path">
+ <node oor:name="Current">
+ <prop oor:name="Temp" oor:type="xs:string">
+ <value install:module="macosx">$(userurl)/temp</value>
+ <value install:module="unx">$(temp)</value>
+ <value install:module="wnt">$(temp)</value>
+ </prop>
+ </node>
+ </node>
</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index e4bec2eaee19..b979f0f097c3 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -179,12 +179,13 @@
<node oor:name="Temp" oor:op="fuse" oor:mandatory="true">
<prop oor:name="IsSinglePath" oor:finalized="true">
- <value>true</value>
+ <value>true</value>
</prop>
- <node oor:name="InternalPaths" oor:finalized="true" />
- <prop oor:name="UserPaths" oor:finalized="true" />
+ <node oor:name="InternalPaths" oor:finalized="true"/>
+ <prop oor:name="UserPaths" oor:finalized="true"/>
<prop oor:name="WritePath">
- <value>$(temp)</value>
+ <value install:module="macosx">$(userurl)/temp</value>
+ <value install:module="unxwnt">$(temp)</value>
</prop>
</node>
diff --git a/officecfg/registry/data/org/openoffice/Office/makefile.mk b/officecfg/registry/data/org/openoffice/Office/makefile.mk
index 52f31ee38261..50b67954aeef 100644
--- a/officecfg/registry/data/org/openoffice/Office/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk
@@ -86,6 +86,8 @@ MODULEFILES= \
Common-cjk.xcu \
Common-ctl.xcu \
Common-korea.xcu \
+ Paths-macosx.xcu \
+ Paths-unxwnt.xcu \
Writer-cjk.xcu \
Writer-defaultfontarial.xcu \
Writer-directcursor.xcu \
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index e834f97d4df9..18668aea5f64 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1657,10 +1657,11 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
</prop>
<prop oor:name="Temp" oor:type="xs:string">
<info>
+ <deprecated>Replaced by org.openoffice.Office.Paths/Temp</deprecated>
<author>MBA</author>
<desc>Specifies the base directory used by the Office to store temp files.</desc>
</info>
- <value>$(temp)</value>
+ <value/>
</prop>
<prop oor:name="Template" oor:type="oor:string-list">
<info>
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 23093bfa066f..3fec8e40bfb7 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1231,9 +1231,20 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
if ( !bResult && !IsReadOnly() )
{
// check whether the file is readonly in fs
+ // the check is only necessary if
// do it only for loading, some contents still might have problems with this property, let them not affect the saving
sal_Bool bContentReadonly = sal_False;
- if ( bLoading )
+ if ( bLoading && ::utl::LocalFileHelper::IsLocalFile( aLogicName ) )
+ {
+ // let the stream be opened to check the possibility to open it for editing
+ GetMedium_Impl();
+ }
+
+ // "IsReadOnly" property does not allow to detect whether the file is readonly always
+ // so we try always to open the file for editing
+ // the file is readonly only in case the read-write stream can not be opened
+ SFX_ITEMSET_ARG( pSet, pWriteStreamItem, SfxUnoAnyItem, SID_STREAM, sal_False);
+ if ( bLoading && !pWriteStreamItem )
{
try
{
@@ -1244,11 +1255,12 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
{}
}
+ // do further checks only if the file not readonly in fs
if ( !bContentReadonly )
{
+ // the special file locking should be used only for file URLs
if ( ::utl::LocalFileHelper::IsLocalFile( aLogicName ) )
{
- // the special file locking should be used only for file URLs
// in case of storing the document should request the output before locking
if ( bLoading )
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 7df93afaa63e..099e649506c0 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -72,6 +72,7 @@
#include "sfxurlrelocator.hxx"
#include "doctemplateslocal.hxx"
#include <sfx2/docfac.hxx>
+#include <sfx2/docfile.hxx>
#include "doc.hrc"
//-----------------------------------------------------------------------------
@@ -909,7 +910,8 @@ sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const ::rtl::OU
Content aParent;
- if ( Content::create( aDirPath.GetMainURL( INetURLObject::NO_DECODE ), maCmdEnv, aParent ) )
+ uno::Reference< XCommandEnvironment > aQuietEnv;
+ if ( Content::create( aDirPath.GetMainURL( INetURLObject::NO_DECODE ), aQuietEnv, aParent ) )
{
for ( sal_Int32 nInd = 0; nInd < 32000; nInd++ )
{
@@ -1919,7 +1921,11 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName,
aStoreArgs[1].Name = ::rtl::OUString::createFromAscii( "DocumentTitle" );
aStoreArgs[1].Value <<= rTemplateName;
- rStorable->storeToURL( aNewTemplateTargetURL, aStoreArgs );
+ ::rtl::OUString aCurrentDocumentURL = rStorable->getLocation();
+ if( !SfxMedium::EqualURLs( aNewTemplateTargetURL, rStorable->getLocation() ))
+ rStorable->storeToURL( aNewTemplateTargetURL, aStoreArgs );
+ else
+ rStorable->store();
// the storing was successful, now the old template with the same name can be removed if it existed
if ( aTemplateToRemoveTargetURL.getLength() )
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index f1e6cc80812e..bd0e65830870 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -374,32 +374,7 @@ sal_Bool GraphicHelper::createThumb_Impl( const GDIMetaFile& rMtf,
if ( aBmp.GetBitCount() != 24 )
aBmp.Convert( BMP_CONVERSION_24BIT );
- // create resulting mask bitmap with metafile output set to black
- GDIMetaFile aMonchromeMtf( rMtf.GetMonochromeMtf( COL_BLACK ) );
- aVDev.DrawWallpaper( Rectangle( aNullPt, aSizePix ), Wallpaper( Color( COL_WHITE ) ) );
- aMonchromeMtf.WindStart();
- aMonchromeMtf.Play( &aVDev, aBackPosPix, aDrawSize );
-
- // watch for overlay mask
- if ( pOverlay )
- {
- Bitmap aOverlayMergeBmp( aVDev.GetBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize() ) );
-
- // create ANDed resulting mask at overlay area
- if ( pOverlay->IsTransparent() )
- aVDev.DrawBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize(), pOverlay->GetMask() );
- else
- {
- aVDev.SetLineColor( COL_BLACK );
- aVDev.SetFillColor( COL_BLACK );
- aVDev.DrawRect( aOverlayRect);
- }
-
- aOverlayMergeBmp.CombineSimple( aVDev.GetBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize() ), BMP_COMBINE_AND );
- aVDev.DrawBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize(), aOverlayMergeBmp );
- }
-
- rBmpEx = BitmapEx( aBmp, aVDev.GetBitmap( aNullPt, aVDev.GetOutputSizePixel() ) );
+ rBmpEx = BitmapEx( aBmp );
}
return !rBmpEx.IsEmpty();
diff --git a/uui/source/masterpassworddlg.src b/uui/source/masterpassworddlg.src
index 88e0993b8a2d..ad0f025febea 100644
--- a/uui/source/masterpassworddlg.src
+++ b/uui/source/masterpassworddlg.src
@@ -58,10 +58,10 @@ ModalDialog DLG_UUI_MASTERPASSWORD
Size = MAP_APPFONT ( 169 , 13 ) ;
PassWord = TRUE ;
};
- FixedLine FL_FIXED_LINE
- {
- Pos = MAP_APPFONT( 0, 35 );
- Size = MAP_APPFONT( 175, 6 );
+ FixedLine FL_FIXED_LINE
+ {
+ Pos = MAP_APPFONT( 0, 35 );
+ Size = MAP_APPFONT( 175, 6 );
};
OKButton BTN_MASTERPASSWORD_OK
diff --git a/uui/source/passcrtdlg.cxx b/uui/source/passcrtdlg.cxx
index 636cd4510ecc..a6db44697918 100644
--- a/uui/source/passcrtdlg.cxx
+++ b/uui/source/passcrtdlg.cxx
@@ -61,6 +61,7 @@ IMPL_LINK( PasswordCreateDialog, OKHdl_Impl, OKButton *, EMPTYARG )
String aErrorMsg( ResId( STR_ERROR_PASSWORDS_NOT_IDENTICAL, *pResourceMgr ));
ErrorBox aErrorBox( this, WB_OK, aErrorMsg );
aErrorBox.Execute();
+ aEDPasswordCrt.SetText( String() );
aEDPasswordRepeat.SetText( String() );
aEDPasswordCrt.GrabFocus();
}
@@ -81,7 +82,7 @@ PasswordCreateDialog::PasswordCreateDialog( Window* _pParent, ResMgr * pResMgr,
,aCancelBtn ( this, ResId( BTN_PASSCRT_CANCEL, *pResMgr ) )
,aHelpBtn ( this, ResId( BTN_PASSCRT_HELP, *pResMgr ) )
,pResourceMgr ( pResMgr )
- ,nMinLen( bMSCryptoMode ? 1 : 5 )
+ ,nMinLen(1) // if it should be changed for ODF, it must stay 1 for bMSCryptoMode
{
FreeResource();
diff --git a/uui/source/passcrtdlg.hrc b/uui/source/passcrtdlg.hrc
index 54a09494e2ab..c36bec4bc9a6 100644
--- a/uui/source/passcrtdlg.hrc
+++ b/uui/source/passcrtdlg.hrc
@@ -43,5 +43,4 @@
#define FT_PASSWORD_CRT 9
#define FT_MSPASSWORD_WARNING 10
-
#endif // UUI_PASSCRTDLG_HRC
diff --git a/uui/source/passcrtdlg.src b/uui/source/passcrtdlg.src
index 13f1ea688620..81629d955343 100644
--- a/uui/source/passcrtdlg.src
+++ b/uui/source/passcrtdlg.src
@@ -91,7 +91,7 @@ ModalDialog DLG_UUI_PASSWORD_CRT
{
Pos = MAP_APPFONT( 4, 64 );
Size = MAP_APPFONT( 137, 40 );
- Text [ en-US ] = "WARNING: If you lose or forget the password, it cannot be recovered. It is advisable to keep passwords in a safe place. Passwords are case-sensitive and at least five characters long.";
+ Text [ en-US ] = "WARNING: If you lose or forget the password, it cannot be recovered. It is advisable to keep passwords in a safe place. Passwords are case-sensitive.";
WordBreak = TRUE;
};
FixedText FT_MSPASSWORD_WARNING
diff --git a/uui/source/passworddlg.hrc b/uui/source/passworddlg.hrc
index 37938b0228ae..95a5e8a78673 100644
--- a/uui/source/passworddlg.hrc
+++ b/uui/source/passworddlg.hrc
@@ -28,16 +28,16 @@
*
************************************************************************/
-#ifndef PASSWORDDLG_HRC
-#define PASSWORDDLG_HRC
+#ifndef PASSWORDDLG_HRC
+#define PASSWORDDLG_HRC
-// local identifiers
-#define BTN_PASSWORD_OK 1
-#define ED_PASSWORD 2
-#define FT_PASSWORD 3
-#define FL_FIXED_LINE_1 4
-#define BTN_PASSWORD_HELP 5
-#define BTN_PASSWORD_CANCEL 6
+// local identifiers
+#define BTN_PASSWORD_OK 1
+#define ED_PASSWORD 2
+#define FT_PASSWORD 3
+#define FL_FIXED_LINE_1 4
+#define BTN_PASSWORD_HELP 5
+#define BTN_PASSWORD_CANCEL 6
-#endif // PASSWORDDLG_HRC
+#endif // PASSWORDDLG_HRC
diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src
index 41845b7488d1..338996a850f5 100644
--- a/uui/source/passworddlg.src
+++ b/uui/source/passworddlg.src
@@ -50,7 +50,7 @@ ModalDialog DLG_UUI_PASSWORD
{
Pos = MAP_APPFONT( 3, 4 );
Size = MAP_APPFONT( 139, 28 );
- Text [ en-US ] = "Enter password to open the file: \n";
+ Text [ en-US ] = "Enter password to open file: \n";
WordBreak = TRUE;
};
generated by cgit (git 2.34.1) at 2025-02-15 16:59:31 +0000