[Libreoffice-commits] .: 3 commits - avmedia/source cui/source fpicker/source odk/examples sd/source sfx2/source starmath/source sw/source vcl/unx
Lubos Lunak
llunak at kemper.freedesktop.org
Thu Dec 22 10:33:17 PST 2011
avmedia/source/viewer/mediawindow.src | 2 -
cui/source/options/optinet2.src | 2 -
fpicker/source/office/iodlg.src | 2 -
fpicker/source/unx/kde4/KDE4FilePicker.cxx | 11 +++-------
odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba | 4 +--
sd/source/ui/app/strings.src | 2 -
sfx2/source/appl/app.src | 2 -
starmath/source/smres.src | 2 -
sw/source/ui/dbui/dbui.src | 2 -
vcl/unx/kde4/warning_guard_qhash.h | 2 +
10 files changed, 15 insertions(+), 16 deletions(-)
New commits:
commit 643de3b64ed4b71ab48a7f100c90c1c4d5f918cc
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Thu Dec 22 19:27:00 2011 +0100
"*.*" is not "all files" (bnc#738021)
Not on any Unix, at least. I have no idea how deep entrenched is this
mistake all over the code, so I'll play safe and just fix the KDE4 fpicker
(GNOME/KDE3 seem to handle it fine), but at least in the UI show just
"All files" instead of "All files (*.*)").
diff --git a/avmedia/source/viewer/mediawindow.src b/avmedia/source/viewer/mediawindow.src
index 1c92b4d..5a6535f 100644
--- a/avmedia/source/viewer/mediawindow.src
+++ b/avmedia/source/viewer/mediawindow.src
@@ -50,7 +50,7 @@ String AVMEDIA_STR_ALL_MEDIAFILES
String AVMEDIA_STR_ALL_FILES
{
- Text[en-US] = "All files (*.*)";
+ Text[en-US] = "All files";
};
// ------------------------------------------------------------------------------
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index 34789e7..9ac8dc1 100644
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -473,7 +473,7 @@ TabPage RID_SVXPAGE_INET_MAIL
String STR_DEFAULT_FILENAME
{
- Text [ en-US ] = "All files (*.*)" ;
+ Text [ en-US ] = "All files" ;
};
};
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 4a3c2f6..da11eb5 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -294,7 +294,7 @@ String RID_FILEOPEN_NOTEXISTENTFILE
String STR_FILTERNAME_ALL
{
- Text [ en-US ] = "All files (*.*)" ;
+ Text [ en-US ] = "All files" ;
};
String STR_SVT_ALREADYEXISTOVERWRITE
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 4027e3c..f282645 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -306,6 +306,9 @@ void SAL_CALL KDE4FilePicker::appendFilter( const ::rtl::OUString &title, const
// openoffice gives us filters separated by ';' qt dialogs just want space separated
f.replace(";", " ");
+ // make sure "*.*" is not used as "all files"
+ f.replace("*.*", "*");
+
_filter.append(QString("%1|%2").arg(f).arg(t));
}
diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba
index 4a36d76..67cd825 100644
--- a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba
+++ b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba
@@ -38,10 +38,10 @@ Sub OpenFileDialog()
oFilePicker = CreateUnoService( "com.sun.star.ui.dialogs.FilePicker" )
REM set filter
- oFilePicker.AppendFilter( "All files (*.*)", "*.*" )
+ oFilePicker.AppendFilter( "All files", "*.*" )
oFilePicker.AppendFilter( "StarOffice 6.0 Text Text Document", "*.sxw" )
oFilePicker.AppendFilter( "StarOffice 6.0 Spreadsheet", "*.sxc" )
- oFilePicker.SetCurrentFilter( "All files (*.*)" )
+ oFilePicker.SetCurrentFilter( "All files" )
REM if no file URL is set, get path settings from configuration
oTextFieldModel = oDialog.Model.TextField1
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 3b6b2e4..1bc40bf 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -397,7 +397,7 @@ String STR_SD_PAGE
};
String STR_ALL_FILES
{
- Text [ en-US ] = "All files (*.*)" ;
+ Text [ en-US ] = "All files" ;
};
String STR_UNDO_INSERT_TEXTFRAME
{
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index f115788..f52b6da 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -466,7 +466,7 @@ String RID_SVXSTR_GRAFIKLINK
};
String STR_SFX_FILTERNAME_ALL
{
- Text [ en-US ] = "All files (*.*)" ;
+ Text [ en-US ] = "All files" ;
};
String RID_SVXSTR_EDITGRFLINK
{
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index dd61684..e565bfa 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -1554,7 +1554,7 @@ String RID_SYMBOLFILESSTR
String RID_ALLFILESSTR
{
- Text [ en-US ] = "All Files (*.*)" ;
+ Text [ en-US ] = "All files" ;
};
String RID_ERR_IDENT
diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src
index 3286d21..db41b95 100644
--- a/sw/source/ui/dbui/dbui.src
+++ b/sw/source/ui/dbui/dbui.src
@@ -159,7 +159,7 @@ String STR_NOTASSIGNED
};
String STR_FILTER_ALL
{
- Text [ en-US ] = "All files (*.*)" ;
+ Text [ en-US ] = "All files" ;
};
String STR_FILTER_ALL_DATA
{
commit 78a7db0523f9611b003facd612411d3d61a0ab13
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Thu Dec 22 19:00:19 2011 +0100
make KDE4FilePicker::appendFilterGroup() simply use appendFilter()
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 562a2d2..4027e3c 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -343,13 +343,7 @@ void SAL_CALL KDE4FilePicker::appendFilterGroup( const rtl::OUString& , const un
for (sal_uInt16 i = 0; i < length; ++i)
{
beans::StringPair aPair = filters[i];
-
- _filter.append(QString("%1|%2").arg(
- toQString(aPair.Second).replace(";", " ")).arg(
- toQString(aPair.First).replace("/","\\/")));
-
- if (i != length - 1)
- _filter.append('\n');
+ appendFilter( aPair.First, aPair.Second );
}
}
commit aa97ec9b4d6332e1b955467df5a5264cbf1ff15a
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Thu Dec 22 12:30:25 2011 +0100
add a note that the Qt bugreport is mistaken
diff --git a/vcl/unx/kde4/warning_guard_qhash.h b/vcl/unx/kde4/warning_guard_qhash.h
index 3ff5f69..a6a520c 100644
--- a/vcl/unx/kde4/warning_guard_qhash.h
+++ b/vcl/unx/kde4/warning_guard_qhash.h
@@ -39,6 +39,8 @@
shadows a global declaration [-Werror=shadow]
Reported upstream as <https://bugreports.qt.nokia.com/browse/QTBUG-22908>.
+
+ And suggested to be closed, because there is no problem in Qt. This is a workaround, at best.
*/
#ifdef _MSC_VER
More information about the Libreoffice-commits
mailing list