summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--automation/source/testtool/objtest.cxx65
-rw-r--r--automation/source/testtool/testtool.ini1
-rw-r--r--basctl/source/basicide/baside2b.cxx9
-rw-r--r--basctl/uiconfig/basicide/toolbar/findbar.xml8
-rw-r--r--extensions/source/plugin/inc/plugin/unx/plugcon.hxx2
-rw-r--r--setup_native/source/mac/ooo/DS_Storebin12556 -> 15364 bytes
-rw-r--r--setup_native/source/mac/ooo/DS_Store_Langpackbin12292 -> 12292 bytes
-rw-r--r--setup_native/source/mac/ooo3_installer.icnsbin56605 -> 42710 bytes
-rw-r--r--setup_native/source/packinfo/spellchecker_selection.txt84
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registrar.cxx48
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx36
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx14
-rw-r--r--wizards/source/importwizard/FilesModul.xba1
13 files changed, 219 insertions, 49 deletions
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 4de58fe1b62f..f52170392758 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -472,6 +472,68 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die d
GetHostConfig();
GetTTPortConfig();
GetUnoPortConfig();
+
+ aConf.SetGroup("Crashreporter");
+
+ String aUP;
+ GETSET( aUP, "UseProxy", "false" );
+ String aPS;
+ GETSET( aPS, "ProxyServer", "" );
+ String aPP;
+ GETSET( aPP, "ProxyPort", "" );
+ String aAC;
+ GETSET( aAC, "AllowContact", "false" );
+ String aRA;
+ GETSET( aRA, "ReturnAddress", "" );
+
+ OUString sPath;
+ if( osl_getExecutableFile( (rtl_uString**)&sPath ) == osl_Process_E_None)
+ {
+ sPath = sPath.copy(7); // strip file://
+
+ int i = sPath.lastIndexOf('/');
+ if (i >= 0)
+ i = sPath.lastIndexOf('/', i-1 );
+
+ if (i >= 0)
+ {
+ sPath = sPath.copy(0, i);
+ ByteString bsPath( sPath.getStr(), sPath.getLength(),
+ RTL_TEXTENCODING_UTF8 );
+
+ aConf.SetGroup( "OOoProgramDir" );
+ String aOPD;
+ // testtool is installed in Basis3.x/program/ dir nowadays
+ bsPath += "/../program";
+ GETSET( aOPD, "Current", bsPath);
+
+ ByteString aSrcRoot(getenv("SRC_ROOT"));
+ aConf.SetGroup( "_profile_Default" );
+ if (aSrcRoot.Len())
+ {
+ String aPBD;
+ aSrcRoot += "/testautomation";
+ GETSET( aPBD, "BaseDir", aSrcRoot );
+
+ String aPHD;
+ aSrcRoot += "/global/hid";
+ GETSET( aPHD, "HIDDir", aSrcRoot );
+ }
+ else
+ {
+ String aPBD;
+ bsPath += "/qatesttool";
+ GETSET( aPBD, "BaseDir", bsPath );
+
+ String aPHD;
+ bsPath += "/global/hid";
+ GETSET( aPHD, "HIDDir", bsPath );
+ }
+
+ String aLD;
+ GETSET( aLD, "LogBaseDir", ByteString( "/tmp" ) );
+ }
+ }
}
#define MAKE_TT_KEYWORD( cName, aType, aResultType, nID ) \
@@ -2620,7 +2682,8 @@ void TestToolObj::DebugFindNoErrors( sal_Bool bDebugFindNoErrors )
SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
{
- if ( BasicRuntimeAccess::IsRunInit() ) // wegen Find im "Global" Befehl des Basic
+ if ( BasicRuntimeAccess::IsRunInit()
+ || ( aStr == String( RTL_CONSTASCII_USTRINGPARAM( "ThisComponent" ) ) ) ) // wegen Find im "Global" Befehl des Basic
return NULL;
SbxVariableRef Old = SbxObject::Find(aStr, aType );
diff --git a/automation/source/testtool/testtool.ini b/automation/source/testtool/testtool.ini
index ff2e43f5c0f6..7b77654eed58 100644
--- a/automation/source/testtool/testtool.ini
+++ b/automation/source/testtool/testtool.ini
@@ -9,7 +9,6 @@ CurrentProfile=_profile_Default
[OOoProgramDir]
Type=Path
-Current=.
[Crashreporter]
UseProxy=false
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 5241049b89cf..7142417cd243 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -411,11 +411,13 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
long nLinSz = pModulWindow->GetHScrollBar()->GetLineSize(); (void)nLinSz;
long nThumb = pModulWindow->GetHScrollBar()->GetThumbPos(); (void)nThumb;
#endif
- sal_Bool bDone = sal_False;
sal_Bool bWasModified = pEditEngine->IsModified();
- if ( !TextEngine::DoesKeyChangeText( rKEvt ) || ImpCanModify() )
+ // see if there is an accelerator to be processed first
+ sal_Bool bDone = SfxViewShell::Current()->KeyInput( rKEvt );
+
+ if ( !bDone && ( !TextEngine::DoesKeyChangeText( rKEvt ) || ImpCanModify() ) )
{
- if ( ( rKEvt.GetKeyCode().GetCode() == KEY_A) && rKEvt.GetKeyCode().IsMod1() )
+ if ( ( rKEvt.GetKeyCode().GetCode() == KEY_A) && rKEvt.GetKeyCode().IsMod1() && !rKEvt.GetKeyCode().IsMod2() )
pEditView->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( 0xFFFFFFFF, 0xFFFF ) ) );
else if ( ( rKEvt.GetKeyCode().GetCode() == KEY_Y ) && rKEvt.GetKeyCode().IsMod1() )
bDone = sal_True; // CTRL-Y schlucken, damit kein Vorlagenkatalog
@@ -442,7 +444,6 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
}
if ( !bDone )
{
- if ( !SfxViewShell::Current()->KeyInput( rKEvt ) )
Window::KeyInput( rKEvt );
}
else
diff --git a/basctl/uiconfig/basicide/toolbar/findbar.xml b/basctl/uiconfig/basicide/toolbar/findbar.xml
new file mode 100644
index 000000000000..0338d3156195
--- /dev/null
+++ b/basctl/uiconfig/basicide/toolbar/findbar.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+ <toolbar:toolbaritem xlink:href=".uno:FindText"/>
+ <toolbar:toolbaritem xlink:href=".uno:DownSearch"/>
+ <toolbar:toolbaritem xlink:href=".uno:UpSearch"/>
+ <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:visible="false"/>
+</toolbar:toolbar>
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index d13068576663..b98ba85260d9 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -94,7 +94,7 @@ extern "C" {
# endif
#endif
-#ifndef _NPAPI_H_
+#if ! defined ( _NPAPI_H_) && ! defined (npapi_h_)
extern "C" {
#include <npsdk/npupp.h>
}
diff --git a/setup_native/source/mac/ooo/DS_Store b/setup_native/source/mac/ooo/DS_Store
index af137c0e6c41..9431578cebb3 100644
--- a/setup_native/source/mac/ooo/DS_Store
+++ b/setup_native/source/mac/ooo/DS_Store
Binary files differ
diff --git a/setup_native/source/mac/ooo/DS_Store_Langpack b/setup_native/source/mac/ooo/DS_Store_Langpack
index 21b08ffb18cc..3a8ad71a5660 100644
--- a/setup_native/source/mac/ooo/DS_Store_Langpack
+++ b/setup_native/source/mac/ooo/DS_Store_Langpack
Binary files differ
diff --git a/setup_native/source/mac/ooo3_installer.icns b/setup_native/source/mac/ooo3_installer.icns
index bacdd17d8470..45fca0fcaf80 100644
--- a/setup_native/source/mac/ooo3_installer.icns
+++ b/setup_native/source/mac/ooo3_installer.icns
Binary files differ
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index f5344b9860ef..aa90dc53fe99 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -8,47 +8,47 @@
# shall be included into the language pack, the keyword "EMPTY" can
# be used as first entry.
-af = "af,en-US"
-ar = "EMPTY,en-US"
-ca = "ca,es,en-US,fr"
-cs = "cs,en-US"
-da = "da,de-DE,en-US"
-de = "de-DE,de-AT,de-CH,en-US,fr,it"
-en-US = "en-US,es,fr"
-en-GB = "en-US,es,fr"
-es = "es,en-US,fr,pt"
-et = "et,en-US"
-fr = "fr,en-US,es"
-gl = "gl,en-US,pt,es"
-he = "he,en-US"
-hu = "hu,de-DE,en-US"
-hr = "hr,de-DE,en-US"
-it = "it,de-DE,en-US,fr"
-ja = "EMPTY,en-US"
-ko = "EMPTY,en-US"
-ku = "ku-TR,en-US"
-lt = "lt,en-US"
-nb = "no,en-US,fr,de-DE,es"
-ne = "ne,en-US"
-nl = "nl,en-US,fr,de-DE"
-nn = "no,en-US,fr,de-DE,es"
-oc = "oc,fr,en-US"
-pl = "pl,de-DE,en-US,ru"
-pt-BR = "pt,en-US,es"
-pt = "pt,en-US,es"
-ro = "ro,en-US,de-DE,hu"
-ru = "ru,de-DE,en-US"
-sk = "sk,en-US"
-sl = "sl,en-US"
-sv = "sv,de-DE,en-US"
-sr = "sr,en-US"
+af = "af"
+ar = "EMPTY"
+ca = "ca,es,fr"
+cs = "cs"
+da = "da,de-DE"
+de = "de-DE,de-AT,de-CH,fr,it"
+en-US = "en,es,fr"
+en-GB = "en,es,fr"
+es = "es,fr,pt"
+et = "et"
+fr = "fr,es"
+gl = "gl,pt,es"
+he = "he"
+hu = "hu,de-DE"
+hr = "hr,de-DE"
+it = "it,de-DE,fr"
+ja = "EMPTY"
+ko = "EMPTY"
+ku = "ku-TR"
+lt = "lt"
+nb = "no,fr,de-DE,es"
+ne = "ne"
+nl = "nl,fr,de-DE"
+nn = "no,fr,de-DE,es"
+oc = "oc,fr"
+pl = "pl,de-DE,ru"
+pt-BR = "pt,es"
+pt = "pt,es"
+ro = "ro,de-DE,hu"
+ru = "ru,de-DE"
+sk = "sk"
+sl = "sl"
+sv = "sv,de-DE"
+sr = "sr"
# ! Note the package 'sr' also holds the dictionaries for 'sh' !
-sh = "sr,en-US"
-sw = "sw,en-US"
-th = "th,en-US"
-uk = "uk,ru,en-US"
-vi = "vi,en-US,fr"
-zh-TW = "EMPTY,en-US"
-zh-CN = "EMPTY,en-US"
-zu = "zu,en-US"
+sh = "sr"
+sw = "sw"
+th = "th"
+uk = "uk,ru"
+vi = "vi,fr"
+zh-TW = "EMPTY"
+zh-CN = "EMPTY"
+zu = "zu"
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
index 45fbed4819d2..5220b1ed6d0c 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
@@ -81,6 +81,14 @@ void Registrar::RegisterForMsWord() const
RegistrationContextInformation::Writer);
RegisterForMsOfficeApplication(
+ m_ContextInformation.GetMOOXWordDocumentFileExtension(),
+ m_ContextInformation.GetMOOXWordDocumentDisplayName(),
+ m_ContextInformation.GetWordDocumentDefaultIconEntry(),
+ m_ContextInformation.GetWordDocumentDefaultShellCommand(),
+ m_ContextInformation.ShellNewCommandDisplayName(),
+ RegistrationContextInformation::Writer);
+
+ RegisterForMsOfficeApplication(
m_ContextInformation.GetWordTemplateFileExtension(),
m_ContextInformation.GetWordTemplateDisplayName(),
m_ContextInformation.GetWordTemplateDefaultIconEntry(),
@@ -114,6 +122,14 @@ void Registrar::UnregisterForMsWord() const
try
{
UnregisterForMsOfficeApplication(
+ m_ContextInformation.GetMOOXWordDocumentFileExtension());
+ }
+ catch(RegistryKeyNotFoundException&)
+ {}
+
+ try
+ {
+ UnregisterForMsOfficeApplication(
m_ContextInformation.GetWordTemplateFileExtension());
}
catch(RegistryKeyNotFoundException&)
@@ -192,6 +208,14 @@ void Registrar::RegisterForMsExcel() const
RegistrationContextInformation::Calc);
RegisterForMsOfficeApplication(
+ m_ContextInformation.GetMOOXExcelSheetFileExtension(),
+ m_ContextInformation.GetMOOXExcelSheetDisplayName(),
+ m_ContextInformation.GetExcelSheetDefaultIconEntry(),
+ m_ContextInformation.GetExcelSheetDefaultShellCommand(),
+ m_ContextInformation.ShellNewCommandDisplayName(),
+ RegistrationContextInformation::Calc);
+
+ RegisterForMsOfficeApplication(
m_ContextInformation.GetExcelTemplateFileExtension(),
m_ContextInformation.GetExcelTemplateDisplayName(),
m_ContextInformation.GetExcelTemplateDefaultIconEntry(),
@@ -217,6 +241,22 @@ void Registrar::UnregisterForMsExcel() const
try
{
UnregisterForMsOfficeApplication(
+ m_ContextInformation.GetMOOXExcelSheetFileExtension());
+ }
+ catch(RegistryKeyNotFoundException&)
+ {}
+
+ try
+ {
+ UnregisterForMsOfficeApplication(
+ m_ContextInformation.GetMOOXPowerPointDocumentFileExtension());
+ }
+ catch(RegistryKeyNotFoundException&)
+ {}
+
+ try
+ {
+ UnregisterForMsOfficeApplication(
m_ContextInformation.GetExcelTemplateFileExtension());
}
catch(RegistryKeyNotFoundException&)
@@ -244,6 +284,14 @@ void Registrar::RegisterForMsPowerPoint() const
RegistrationContextInformation::Impress);
RegisterForMsOfficeApplication(
+ m_ContextInformation.GetMOOXPowerPointDocumentFileExtension(),
+ m_ContextInformation.GetMOOXPowerPointDocumentDisplayName(),
+ m_ContextInformation.GetPowerPointDocumentDefaultIconEntry(),
+ m_ContextInformation.GetPowerPointDocumentDefaultShellCommand(),
+ m_ContextInformation.ShellNewCommandDisplayName(),
+ RegistrationContextInformation::Impress);
+
+ RegisterForMsOfficeApplication(
m_ContextInformation.GetPowerPointShowFileExtension(),
m_ContextInformation.GetPowerPointShowDisplayName(),
m_ContextInformation.GetPowerPointShowDefaultIconEntry(),
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
index f07c35a4d988..2f04d319dd80 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
@@ -53,6 +53,18 @@ std::wstring RegistrationContextInformation::GetWordDocumentDefaultShellCommand(
return std::wstring(TEXT("open"));
}
+std::wstring RegistrationContextInformation::GetMOOXWordDocumentDisplayName() const
+{
+ std::wstring str;
+ str = TEXT("Microsoft Word 2007 Document");
+ return str;
+}
+
+std::wstring RegistrationContextInformation::GetMOOXWordDocumentFileExtension() const
+{
+ return std::wstring(TEXT(".docx"));
+}
+
std::wstring RegistrationContextInformation::GetWordTemplateDisplayName() const
{
std::wstring str;
@@ -125,6 +137,18 @@ std::wstring RegistrationContextInformation::GetExcelSheetDefaultShellCommand()
return std::wstring(TEXT("open"));
}
+std::wstring RegistrationContextInformation::GetMOOXExcelSheetDisplayName() const
+{
+ std::wstring str;
+ str = TEXT("Microsoft Excel 2007 Spreadsheet");
+ return str;
+}
+
+std::wstring RegistrationContextInformation::GetMOOXExcelSheetFileExtension() const
+{
+ return std::wstring(TEXT(".xlsx"));
+}
+
std::wstring RegistrationContextInformation::GetExcelTemplateDisplayName() const
{
std::wstring str;
@@ -173,6 +197,18 @@ std::wstring RegistrationContextInformation::GetPowerPointDocumentDefaultShellCo
return std::wstring(TEXT("open"));
}
+std::wstring RegistrationContextInformation::GetMOOXPowerPointDocumentDisplayName() const
+{
+ std::wstring str;
+ str = TEXT("Microsoft PowerPoint 2007 Presentation");
+ return str;
+}
+
+std::wstring RegistrationContextInformation::GetMOOXPowerPointDocumentFileExtension() const
+{
+ return std::wstring(TEXT(".pptx"));
+}
+
std::wstring RegistrationContextInformation::GetPowerPointTemplateDisplayName() const
{
std::wstring str;
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
index 91a42e6b58d7..d3297b14775c 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
@@ -47,6 +47,14 @@ public:
std::wstring GetWordDocumentDefaultIconEntry() const;
std::wstring GetWordDocumentDefaultShellCommand() const;
+ /** MOOX Word document information
+ The icon index is the index of the icon
+ in soffice.exe to be associated with
+ word document files
+ */
+ std::wstring GetMOOXWordDocumentDisplayName() const;
+ std::wstring GetMOOXWordDocumentFileExtension() const;
+
/** Word template information
The icon index is the index of the icon
in soffice.exe to be associated with
@@ -77,6 +85,9 @@ public:
std::wstring GetExcelSheetDefaultIconEntry() const;
std::wstring GetExcelSheetDefaultShellCommand() const;
+ std::wstring GetMOOXExcelSheetDisplayName() const;
+ std::wstring GetMOOXExcelSheetFileExtension() const;
+
/** Excel template information
The icon index is the index of the icon
in soffice.exe to be associated with
@@ -97,6 +108,9 @@ public:
std::wstring GetPowerPointDocumentDefaultIconEntry() const;
std::wstring GetPowerPointDocumentDefaultShellCommand() const;
+ std::wstring GetMOOXPowerPointDocumentDisplayName() const;
+ std::wstring GetMOOXPowerPointDocumentFileExtension() const;
+
/** PowerPoint template information
The icon index is the index of the icon
in soffice.exe to be associated with
diff --git a/wizards/source/importwizard/FilesModul.xba b/wizards/source/importwizard/FilesModul.xba
index cb999252b24c..e35e0b3a3ba9 100644
--- a/wizards/source/importwizard/FilesModul.xba
+++ b/wizards/source/importwizard/FilesModul.xba
@@ -41,6 +41,7 @@ Dim NewContentList() as String
Dim XMLTemplateContentString as String
Dim ApplIndex as Integer
Dim bAssignFileName as Boolean
+Dim bInterruptSearch as Boolean
bInterruptSearch = False
For i = 0 To MaxCollectIndex
SearchDir = PathCollection(i,0)
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 07:02:04 +0000