[Libreoffice-commits] core.git: odk/docs
odk/docs/idl/idl_chapter_refs.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0c490c80a6345e24990dd2b56d47a8623cf7ec47 Author: Matthias Seidel AuthorDate: Wed Jun 5 23:15:55 2019 + Commit: Caolán McNamara CommitDate: Sun Aug 11 21:32:17 2019 +0200 Fixed "OfficeDocument" (cherry picked from commit 856d28801b59d45cf4d32602adc57a08cd618b6d) Change-Id: Ie915588bda5930dc51a1484f20d0bbd9d955ec29 Reviewed-on: https://gerrit.libreoffice.org/77269 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/odk/docs/idl/idl_chapter_refs.txt b/odk/docs/idl/idl_chapter_refs.txt index 8be5850fb4cb..875ce811c309 100644 --- a/odk/docs/idl/idl_chapter_refs.txt +++ b/odk/docs/idl/idl_chapter_refs.txt @@ -3037,7 +3037,7 @@ com.sun.star.frame.Controller com.sun.star.lang.XMultiServiceFactory com.sun.star.frame.XDesktop com.sun.star.frame.Frame -com.sun.star.model.OfficeDocument +com.sun.star.document.OfficeDocument TOPIC: LINK:Documentation/DevGuide/GUI/Dialog_Controls ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/README
scripting/README |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b9a776837462eeb6d50d0decc42604c0c3008eb1 Author: Matthias Seidel AuthorDate: Tue Jun 4 11:10:30 2019 + Commit: Caolán McNamara CommitDate: Sun Aug 11 17:04:14 2019 +0200 Fixed typo (cherry picked from commit 1f21ba2f2a1bc287cd869b0a03eac6e8a90eb21f) Change-Id: I286d0e6b04d6505f0728d6f84d34239be060dc27 Reviewed-on: https://gerrit.libreoffice.org/77268 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/scripting/README b/scripting/README index ba9a1677597d..3a019e27d254 100644 --- a/scripting/README +++ b/scripting/README @@ -1,7 +1,7 @@ This module provides the source code for the Scripting Framework. For more information on the Scripting Framework, see the project web page: -[http://framework.openoffice.org/scripting/] +[https://framework.openoffice.org/scripting/] This module uses astyle to keep consistent java coding style. Please run ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source
svx/source/sidebar/paragraph/ParaPropertyPanel.src | 532 ++---
1 file changed, 268 insertions(+), 264 deletions(-)
New commits:
commit cc36ea775eb22fd95e3e746f1912264763faf57d
Author: Matthias Seidel
AuthorDate: Fri Aug 2 18:03:42 2019 +
Commit: Matthias Seidel
CommitDate: Fri Aug 2 18:03:42 2019 +
Cleaned up whitespace, reordered Increase/Decrease Indent in sidebar
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src
b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
index ffa10f7a7928..5824653f08ac 100755
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
@@ -19,112 +19,114 @@
*
*/
+
+
#include "ParaPropertyPanel.hrc"
#include
#include "helpid.hrc"
-#define MASKCOLOR MaskColor = Color { Red = 0x ; Green = 0x ; Blue =
0x ; };
+#define MASKCOLOR MaskColor = Color { Red = 0x ; Green = 0x ; Blue =
0x ; };
-#define SVX_PROPERTYPANEL_PARA_VERT_IDLIST \
-IdList = \
-{ \
-IID_VERT_TOP ; \
+#define SVX_PROPERTYPANEL_PARA_VERT_IDLIST \
+IdList =\
+{ \
+IID_VERT_TOP ; \
IID_VERT_CENTER ; \
IID_VERT_BOTTOM ; \
-}; \
+}; \
IdCount = { 3 ; };
#define SVX_PROPERTYPANEL_PARA_NUMBULLET_IDLIST \
-IdList = \
-{ \
-IID_BULLET ; \
-IID_NUMBER ; \
-}; \
+IdList =\
+{ \
+IID_BULLET ;\
+IID_NUMBER ;\
+}; \
IdCount = { 2 ; };
-//add by wj for sym2_7380
+// add by wj for sym2_7380
#define SVX_PROPERTYPANEL_PARA_NUMBULLET_IDLIST_RTL \
-IdList = \
-{ \
-IID_BULLET ; \
-IID_NUMBER ; \
-}; \
+IdList =\
+{ \
+IID_BULLET ;\
+IID_NUMBER ;\
+}; \
IdCount = { 2 ; };
Control RID_SIDEBAR_PARA_PANEL
{
-OutputSize = TRUE;
-DialogControl = TRUE;
-Border = FALSE;
-Size = MAP_APPFONT( PROPERTYPAGE_WIDTH, PARA_SECTIONPAGE_HEIGHT );
+OutputSize = TRUE ;
+DialogControl = TRUE ;
+Border = FALSE ;
+Size = MAP_APPFONT ( PROPERTYPAGE_WIDTH, PARA_SECTIONPAGE_HEIGHT ) ;
HelpID = HID_PROPERTYPANEL_PARA_SECTION ;
-Text = "Paragraph";
+Text = "Paragraph" ;
ToolBox TBX_HORIZONTALALIGNMENT
{
-Pos = MAP_APPFONT ( TBX_HORI_ALIGN_X , TBX_HORI_ALIGN_Y );
-Size = MAP_APPFONT ( ALIGNMENT_TBX_WIDTH*4 ,ALIGNMENT_TBX_HEIGHT);
+Pos = MAP_APPFONT ( TBX_HORI_ALIGN_X, TBX_HORI_ALIGN_Y ) ;
+Size = MAP_APPFONT ( ALIGNMENT_TBX_WIDTH*4 ,ALIGNMENT_TBX_HEIGHT) ;
SVLook = TRUE ;
Border = FALSE ;
-HelpID = HID_PPROPERTYPANEL_PARA_TBX_HALIGN;
-Text = "Horizontal Alignment";
+HelpID = HID_PPROPERTYPANEL_PARA_TBX_HALIGN ;
+Text = "Horizontal Alignment" ;
ItemList =
{
ToolBoxItem
{
Identifier = BT_SUBSTLEFT ;
-HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_LEFT;
+HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_LEFT ;
Text [ en-US ] = "Align Left" ;
};
ToolBoxItem
{
Identifier = BT_SUBSTCENTER ;
-HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_CENTER;
+HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_CENTER ;
Text [ en-US ] = "Align Center" ;
};
ToolBoxItem
{
Identifier = BT_SUBSTRIGHT ;
-HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_RIGHT;
+HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_RIGHT ;
Text [ en-US ] = "Align Right" ;
};
ToolBoxItem
{
Identifier = BT_SUBSTJUSTIFY ;
-HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_JUSTIFY;
+HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_JUSTIFY ;
Text [ en-US ] = "Align Justified" ;
};
};
};
ToolBox TBX_VERT_ALIGN
{
-HelpID = HID_PPROPERTYPANEL_PARA_TBX_VALIGN;
+HelpID = HID_PPROPERTYPANEL_PARA_TBX_VALIGN ;
SVLook = TRUE ;
Border = FALSE ;
-Pos = MAP_APPFONT ( TBX_VERT_ALIGN_X, TBX_VERT_ALIGN_Y ) ;
-Size = MAP_APPFONT ( TOOLBOX_ITEM_WIDTH * 3 , TOOLBOX_ITEM_HEIGHT) ;
+Pos = MAP_APPFONT ( TBX_VERT_ALI
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/uiconfig sd/uiconfig
sc/uiconfig/scalc/statusbar/statusbar.xml|2 +- sd/uiconfig/sdraw/statusbar/statusbar.xml|2 +- sd/uiconfig/simpress/statusbar/statusbar.xml |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit af40db04de2f5073bd31fb4b7305fc6ff98970ff Author: Matthias Seidel AuthorDate: Thu Aug 1 20:35:24 2019 + Commit: Matthias Seidel CommitDate: Thu Aug 1 20:35:24 2019 + Unified size of zoom slider/zoom box in statusbar diff --git a/sc/uiconfig/scalc/statusbar/statusbar.xml b/sc/uiconfig/scalc/statusbar/statusbar.xml index c57263258cd3..8ff889bd30fb 100644 --- a/sc/uiconfig/scalc/statusbar/statusbar.xml +++ b/sc/uiconfig/scalc/statusbar/statusbar.xml @@ -28,6 +28,6 @@ - + diff --git a/sd/uiconfig/sdraw/statusbar/statusbar.xml b/sd/uiconfig/sdraw/statusbar/statusbar.xml index 109c79be8b8e..bc50ac85affd 100644 --- a/sd/uiconfig/sdraw/statusbar/statusbar.xml +++ b/sd/uiconfig/sdraw/statusbar/statusbar.xml @@ -28,5 +28,5 @@ - + \ No newline at end of file diff --git a/sd/uiconfig/simpress/statusbar/statusbar.xml b/sd/uiconfig/simpress/statusbar/statusbar.xml index 109c79be8b8e..bc50ac85affd 100644 --- a/sd/uiconfig/simpress/statusbar/statusbar.xml +++ b/sd/uiconfig/simpress/statusbar/statusbar.xml @@ -28,5 +28,5 @@ - + \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/source
sfx2/source/sidebar/Theme.cxx | 78 ++
1 file changed, 4 insertions(+), 74 deletions(-)
New commits:
commit 7840d0ed4deb047f5977f258deb69d0a4ddb9918
Author: Matthias Seidel
AuthorDate: Thu Aug 1 08:19:41 2019 +
Commit: Matthias Seidel
CommitDate: Thu Aug 1 08:19:41 2019 +
Add close button for high contrast in side bar
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 75dfa3e91dc9..dd0739a3fdd6 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -41,8 +41,6 @@ namespace sfx2 { namespace sidebar {
::rtl::Reference Theme::mpInstance;
-
-
Theme& Theme::GetCurrentTheme (void)
{
if ( ! mpInstance.is())
@@ -54,8 +52,6 @@ Theme& Theme::GetCurrentTheme (void)
}
-
-
Theme::Theme (void)
: ThemeInterfaceBase(m_aMutex),
maImages(),
@@ -76,15 +72,11 @@ Theme::Theme (void)
}
-
-
Theme::~Theme (void)
{
}
-
-
Image Theme::GetImage (const ThemeItem eItem)
{
const PropertyType eType (GetPropertyType(eItem));
@@ -95,8 +87,6 @@ Image Theme::GetImage (const ThemeItem eItem)
}
-
-
Color Theme::GetColor (const ThemeItem eItem)
{
const PropertyType eType (GetPropertyType(eItem));
@@ -112,8 +102,6 @@ Color Theme::GetColor (const ThemeItem eItem)
}
-
-
const Paint& Theme::GetPaint (const ThemeItem eItem)
{
const PropertyType eType (GetPropertyType(eItem));
@@ -124,16 +112,12 @@ const Paint& Theme::GetPaint (const ThemeItem eItem)
}
-
-
const Wallpaper Theme::GetWallpaper (const ThemeItem eItem)
{
return GetPaint(eItem).GetWallpaper();
}
-
-
sal_Int32 Theme::GetInteger (const ThemeItem eItem)
{
const PropertyType eType (GetPropertyType(eItem));
@@ -144,8 +128,6 @@ sal_Int32 Theme::GetInteger (const ThemeItem eItem)
}
-
-
bool Theme::GetBoolean (const ThemeItem eItem)
{
const PropertyType eType (GetPropertyType(eItem));
@@ -156,8 +138,6 @@ bool Theme::GetBoolean (const ThemeItem eItem)
}
-
-
Rectangle Theme::GetRectangle (const ThemeItem eItem)
{
const PropertyType eType (GetPropertyType(eItem));
@@ -168,8 +148,6 @@ Rectangle Theme::GetRectangle (const ThemeItem eItem)
}
-
-
bool Theme::IsHighContrastMode (void)
{
const Theme& rTheme (GetCurrentTheme());
@@ -177,8 +155,6 @@ bool Theme::IsHighContrastMode (void)
}
-
-
void Theme::HandleDataChange (void)
{
Theme& rTheme (GetCurrentTheme());
@@ -194,8 +170,6 @@ void Theme::HandleDataChange (void)
}
-
-
void Theme::InitializeTheme (void)
{
setPropertyValue(
@@ -207,8 +181,6 @@ void Theme::InitializeTheme (void)
}
-
-
void Theme::UpdateTheme (void)
{
SidebarResource aLocalResource;
@@ -385,7 +357,10 @@ void Theme::UpdateTheme (void)
:
A2S("private:graphicrepository/sfx2/res/symphony/morebutton.png")));
setPropertyValue(
maPropertyIdToNameMap[Image_Closer],
-Any(A2S("private:graphicrepository/sfx2/res/closedoc.png")));
+Any(
+mbIsHighContrastMode
+? A2S("private:graphicrepository/sfx2/res/closedochc.png")
+: A2S("private:graphicrepository/sfx2/res/closedoc.png")));
setPropertyValue(
maPropertyIdToNameMap[Image_CloseIndicator],
Any(
@@ -473,8 +448,6 @@ void Theme::UpdateTheme (void)
}
-
-
void SAL_CALL Theme::disposing (void)
{
ChangeListeners aListeners;
@@ -506,16 +479,12 @@ void SAL_CALL Theme::disposing (void)
}
-
-
Reference Theme::GetPropertySet (void)
{
return
Reference(static_cast(()),
UNO_QUERY);
}
-
-
Reference SAL_CALL Theme::getPropertySetInfo (void)
throw(cssu::RuntimeException)
{
@@ -523,8 +492,6 @@ Reference SAL_CALL
Theme::getPropertySetInfo (void)
}
-
-
void SAL_CALL Theme::setPropertyValue (
const ::rtl::OUString& rsPropertyName,
const cssu::Any& rValue)
@@ -570,8 +537,6 @@ void SAL_CALL Theme::setPropertyValue (
}
-
-
Any SAL_CALL Theme::getPropertyValue (
const ::rtl::OUString& rsPropertyName)
throw(css::beans::UnknownPropertyException,
@@ -592,8 +557,6 @@ Any SAL_CALL Theme::getPropertyValue (
}
-
-
void SAL_CALL Theme::addPropertyChangeListener(
const ::rtl::OUString& rsPropertyName,
const cssu::Reference& rxListener)
@@ -620,8 +583,6 @@ void SAL_CALL Theme::addPropertyChangeListener(
}
-
-
void SAL_CALL Theme::removePropertyChangeListener(
const ::rtl::OUString& rsPropertyName,
const cssu::Reference& rxListener)
@@ -658,8 +619,6 @@ void SAL_CALL Theme::removePropertyChangeListener(
}
-
-
void SAL_CALL Theme::addVetoableChangeListener(
const ::rtl::OUString& rsPropertyName,
const cssu::Reference& rxListener)
@@ -686,8 +645,6 @@ void SAL_CALL Theme::addVetoableChangeListener(
}
-
-
void SAL_C
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/sfx2
default_images/sfx2/res/symphony/morebutton_h.png |binary 1 file changed New commits: commit 1fb2327e019bd87a8ff17d9a12a60860252f6333 Author: Matthias Seidel AuthorDate: Wed Jul 31 23:54:19 2019 + Commit: Matthias Seidel CommitDate: Wed Jul 31 23:54:19 2019 + Update graphic for high contrast diff --git a/default_images/sfx2/res/symphony/morebutton_h.png b/default_images/sfx2/res/symphony/morebutton_h.png index a1681fedbcdc..1e1f4be430b1 100644 Binary files a/default_images/sfx2/res/symphony/morebutton_h.png and b/default_images/sfx2/res/symphony/morebutton_h.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/source
sfx2/source/sidebar/Sidebar.src | 128
sfx2/source/sidebar/Theme.cxx | 12 +--
2 files changed, 70 insertions(+), 70 deletions(-)
New commits:
commit b953e761e3527193baf421a27f6048b06cc26c0a
Author: Matthias Seidel
AuthorDate: Wed Jul 31 18:49:25 2019 +
Commit: Matthias Seidel
CommitDate: Wed Jul 31 18:49:25 2019 +
Cleaned up whitespace. Use correct icon for high contrast.
diff --git a/sfx2/source/sidebar/Sidebar.src b/sfx2/source/sidebar/Sidebar.src
index f47a895550fe..ce1230f61163 100644
--- a/sfx2/source/sidebar/Sidebar.src
+++ b/sfx2/source/sidebar/Sidebar.src
@@ -27,286 +27,286 @@ Resource RID_SIDEBAR_RESOURCE
{
Image IMAGE_SIDEBAR_PLUS
{
-ImageBitmap = Bitmap { File = "plus.png" ;};
+ImageBitmap = Bitmap { File = "plus.png" ;} ;
};
Image IMAGE_SIDEBAR_PLUS_HC
{
-ImageBitmap = Bitmap { File = "plus_hc.png" ;};
+ImageBitmap = Bitmap { File = "plus_hc.png" ;} ;
};
Image IMAGE_SIDEBAR_MINUS
{
-ImageBitmap = Bitmap { File = "minus.png" ;};
+ImageBitmap = Bitmap { File = "minus.png" ;} ;
};
Image IMAGE_SIDEBAR_MINUS_HC
{
-ImageBitmap = Bitmap { File = "minus_hc.png" ;};
+ImageBitmap = Bitmap { File = "minus_hc.png" ;} ;
};
Image IMAGE_SIDEBAR_GRIP
{
-ImageBitmap = Bitmap { File = "grip.png" ;};
+ImageBitmap = Bitmap { File = "grip.png" ;} ;
};
Image IMAGE_SIDEBAR_GRIP_HC
{
-ImageBitmap = Bitmap { File = "grip_hc.png" ;};
+ImageBitmap = Bitmap { File = "grip_hc.png" ;} ;
};
Image IMAGE_SIDEBAR_MENU
{
-ImageBitmap = Bitmap { File = "symphony/open_more.png" ;};
+ImageBitmap = Bitmap { File = "symphony/open_more.png" ;} ;
};
Image IMAGE_SIDEBAR_MENU_HC
{
-ImageBitmap = Bitmap { File = "symphony/open_more_hc.png" ;};
+ImageBitmap = Bitmap { File = "symphony/open_more_hc.png" ;} ;
};
Image IMAGE_SIDEBAR_DETAIL_DIALOG
{
-ImageBitmap = Bitmap { File = "symphony/morebutton.png" ;};
+ImageBitmap = Bitmap { File = "symphony/morebutton.png" ;} ;
};
Image IMAGE_SIDEBAR_DETAIL_DIALOG_HC
{
-ImageBitmap = Bitmap { File = "symphony/morebutton_h.png" ;};
+ImageBitmap = Bitmap { File = "symphony/morebutton_h.png" ;} ;
};
Image IMAGE_SIDEBAR_TOOLBOX_SEPARATOR
{
-ImageBitmap = Bitmap { File = "separator.png" ;};
+ImageBitmap = Bitmap { File = "separator.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_3D_LARGE
{
-ImageBitmap = Bitmap { File = "symphony/sidebar-3d-large.png" ;};
+ImageBitmap = Bitmap { File = "symphony/sidebar-3d-large.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_3D_LARGE_HC
{
-ImageBitmap = Bitmap { File = "symphony/sidebar-3d-large-hc.png" ;};
+ImageBitmap = Bitmap { File = "symphony/sidebar-3d-large-hc.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_3D_SMALL
{
-ImageBitmap = Bitmap { File = "symphony/sidebar-3d-small.png" ;};
+ImageBitmap = Bitmap { File = "symphony/sidebar-3d-small.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_3D_SMALL_HC
{
-ImageBitmap = Bitmap { File = "symphony/sidebar-3d-small-hc.png" ;};
+ImageBitmap = Bitmap { File = "symphony/sidebar-3d-small-hc.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_ANIMATION_LARGE
{
-ImageBitmap = Bitmap { File = "symphony/sidebar-animation-large.png"
;};
+ImageBitmap = Bitmap { File = "symphony/sidebar-animation-large.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_ANIMATION_LARGE_HC
{
-ImageBitmap = Bitmap { File =
"symphony/sidebar-animation-large-hc.png" ;};
+ImageBitmap = Bitmap { File =
"symphony/sidebar-animation-large-hc.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_ANIMATION_SMALL
{
-ImageBitmap = Bitmap { File = "symphony/sidebar-animation-small.png"
;};
+ImageBitmap = Bitmap { File = "symphony/sidebar-animation-small.png"
;} ;
};
Image IMAGE_SIDEBAR_DECK_ANIMATION_SMALL_HC
{
-ImageBitmap = Bitmap { File =
"symphony/sidebar-animation-small-hc.png" ;};
+ImageBitmap = Bitmap { File =
"symphony/sidebar-animation-small-hc.png" ;} ;
};
Image IMAGE_SIDEBAR_DECK_COLORS_LARGE
{
-ImageBitmap = Bitmap { File = "symphony/sidebar-colors-large.png" ;};
+ImageBitmap = Bitmap { File = "symphony/sidebar-colors-large.png"
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/sfx2 README sfx2/source
README|2 +-
default_images/sfx2/res/symphony/open_more_hc.png |binary
sfx2/source/sidebar/Sidebar.src |9 ++---
sfx2/source/sidebar/Theme.cxx |6 --
4 files changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 1546abf4013c61e38d14751e0445b5d3b3ce6d19
Author: Matthias Seidel
AuthorDate: Wed Jul 31 15:38:28 2019 +
Commit: Matthias Seidel
CommitDate: Wed Jul 31 15:38:28 2019 +
Updated download number to 275 million.
diff --git a/README b/README
index a35686a78ea6..d190ba495ede 100644
--- a/README
+++ b/README
@@ -19,7 +19,7 @@ Apache OpenOffice (AOO)
FreeBSD
OS/2
-OpenOffice is used by millions of users worldwide and with more than 270
million
+OpenOffice is used by millions of users worldwide and with more than 275
million
downloads it is one of the most successful open source projects.
Getting the latest sources via Subversion
commit 1eb57609d556201cac9fd44251f3dbe1a5668964
Author: Matthias Seidel
AuthorDate: Wed Jul 31 15:21:55 2019 +
Commit: Matthias Seidel
CommitDate: Wed Jul 31 15:21:55 2019 +
Added high contrast icon for sidebar menu
diff --git a/default_images/sfx2/res/symphony/open_more_hc.png
b/default_images/sfx2/res/symphony/open_more_hc.png
new file mode 100644
index ..63c10cc68697
Binary files /dev/null and b/default_images/sfx2/res/symphony/open_more_hc.png
differ
diff --git a/sfx2/source/sidebar/Sidebar.src b/sfx2/source/sidebar/Sidebar.src
index aa0c348b6882..f47a895550fe 100644
--- a/sfx2/source/sidebar/Sidebar.src
+++ b/sfx2/source/sidebar/Sidebar.src
@@ -19,6 +19,8 @@
*
*/
+
+
#include "Sidebar.hrc"
Resource RID_SIDEBAR_RESOURCE
@@ -60,7 +62,7 @@ Resource RID_SIDEBAR_RESOURCE
Image IMAGE_SIDEBAR_MENU_HC
{
-ImageBitmap = Bitmap { File = "menu_hc.png" ;};
+ImageBitmap = Bitmap { File = "symphony/open_more_hc.png" ;};
};
Image IMAGE_SIDEBAR_DETAIL_DIALOG
@@ -284,11 +286,11 @@ Resource RID_SIDEBAR_RESOURCE
String STRING_CUSTOMIZATION
{
-Text [en-US] = "Customization";
+Text [en-US] = "Customization";
};
String STRING_RESTORE
{
-Text [en-US] = "Restore Default";
+Text [en-US] = "Restore Default";
};
};
@@ -307,3 +309,4 @@ String SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX
Text [en-US] = "Panel: ";
};
+// ** EOF
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index f9d51325e7b9..317a2a68b199 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -19,6 +19,8 @@
*
*/
+
+
#include "precompiled_sfx2.hxx"
#include "sfx2/sidebar/Theme.hxx"
@@ -345,7 +347,7 @@ void Theme::UpdateTheme (void)
setPropertyValue(
maPropertyIdToNameMap[Paint_HorizontalBorder],
Any(sal_Int32(aBorderColor.GetRGBColor(;
-//mbIsHighContrastMode ? 0x00ff00 : 0xe4e4e4)));
+//mbIsHighContrastMode ? 0x00ff00 : 0xe4e4e4)));
setPropertyValue(
maPropertyIdToNameMap[Paint_VerticalBorder],
Any(sal_Int32(aBorderColor.GetRGBColor(;
@@ -373,7 +375,7 @@ void Theme::UpdateTheme (void)
maPropertyIdToNameMap[Image_TabBarMenu],
Any(
mbIsHighContrastMode
-? A2S("private:graphicrepository/sfx2/res/menu_hc.png")
+?
A2S("private:graphicrepository/sfx2/res/symphony/open_more_hc.png")
:
A2S("private:graphicrepository/sfx2/res/symphony/open_more.png")));
setPropertyValue(
maPropertyIdToNameMap[Image_PanelMenu],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - default_images/svx ooo_custom_images/classic svx/source
default_images/svx/res/slidecontrol.png |binary
default_images/svx/res/slidecontrol_h.png |binary
dev/null|binary
ooo_custom_images/classic/classic_images.tar.gz |binary
svx/source/stbctrls/stbctrls.src|4 ++--
5 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7baff79ad8de015106bfff82a080f737840c21be
Author: Matthias Seidel
AuthorDate: Mon Jul 29 21:48:42 2019 +
Commit: Matthias Seidel
CommitDate: Mon Jul 29 21:48:42 2019 +
Added "old" graphics for slidecontrol to classic icon set
diff --git a/ooo_custom_images/classic/classic_images.tar.gz
b/ooo_custom_images/classic/classic_images.tar.gz
index f83fa028b17d..fd5f119cbea2 100644
Binary files a/ooo_custom_images/classic/classic_images.tar.gz and
b/ooo_custom_images/classic/classic_images.tar.gz differ
commit 3972b657b892c942c2b3caec0c060c7ad434b9c6
Author: Matthias Seidel
AuthorDate: Mon Jul 29 21:42:53 2019 +
Commit: Matthias Seidel
CommitDate: Mon Jul 29 21:42:53 2019 +
Renamed graphics for zoom slider
diff --git a/default_images/svx/res/navigationball_10.png
b/default_images/svx/res/slidecontrol.png
similarity index 100%
rename from default_images/svx/res/navigationball_10.png
rename to default_images/svx/res/slidecontrol.png
diff --git a/default_images/svx/res/navigationball_10_h.png
b/default_images/svx/res/slidecontrol_h.png
similarity index 100%
rename from default_images/svx/res/navigationball_10_h.png
rename to default_images/svx/res/slidecontrol_h.png
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 31409c145dd8..030b6b8b7662 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -266,7 +266,7 @@ Image RID_SVXBMP_SLIDERBUTTON
{
ImageBitmap = Bitmap
{
-File = "navigationball_10.png" ;
+File = "slidecontrol.png" ;
};
};
Image RID_SVXBMP_SLIDERDECREASE
@@ -287,7 +287,7 @@ Image RID_SVXBMP_SLIDERBUTTON_HC
{
ImageBitmap = Bitmap
{
-File = "navigationball_10_h.png" ;
+File = "slidecontrol_h.png" ;
};
};
Image RID_SVXBMP_SLIDERDECREASE_HC
commit 0969f013fb2c0136f9a6cd57a615ecbba66382c6
Author: Matthias Seidel
AuthorDate: Mon Jul 29 21:15:34 2019 +
Commit: Matthias Seidel
CommitDate: Mon Jul 29 21:15:34 2019 +
Flattened graphics for zoom slider
diff --git a/default_images/svx/res/navigationball_10.png
b/default_images/svx/res/navigationball_10.png
index c5870270382d..33f65b7da09c 100644
Binary files a/default_images/svx/res/navigationball_10.png and
b/default_images/svx/res/navigationball_10.png differ
diff --git a/default_images/svx/res/navigationball_10_h.png
b/default_images/svx/res/navigationball_10_h.png
index 9902f58db1e3..7786c2d8a818 100644
Binary files a/default_images/svx/res/navigationball_10_h.png and
b/default_images/svx/res/navigationball_10_h.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/ui/ribbar/workctrl.src | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 1aadb3938816d739c143c3b150d0413dfbbcfc86
Author: Matthias Seidel
AuthorDate: Mon Jul 29 17:56:59 2019 +
Commit: Matthias Seidel
CommitDate: Mon Jul 29 17:56:59 2019 +
Small corrections (note -> comment)
diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src
index b0e21b0b4ba1..9533e6cb8ff4 100644
--- a/sw/source/ui/ribbar/workctrl.src
+++ b/sw/source/ui/ribbar/workctrl.src
@@ -138,12 +138,12 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN
};
FixedLine FL_SEP
{
-//no position, no text
+// no position, no text
Size = MAP_APPFONT ( 20, 4 ) ;
};
FixedText FI_INFO
{
-//no position, no text
+// no position, no text
Size = MAP_APPFONT ( 20, 8 ) ;
Center = TRUE ;
};
@@ -201,7 +201,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN
};
String ST_POSTIT
{
-Text [ en-US ] = "Note" ;
+Text [ en-US ] = "Comment" ;
};
String ST_SRCH_REP
{
@@ -226,12 +226,12 @@ Noch ein paar Reserven
ToolBoxItem
{
Identifier = NID_NEXT;
-Text = "Vorw�rts" ;
+Text = "Vorwärts" ;
};
ToolBoxItem
{
Identifier = NID_PREV;
-Text = "R�ckw�rts" ;
+Text = "Rückwärts" ;
};
ToolBoxItem
{
@@ -247,7 +247,7 @@ Noch ein paar Reserven
*/
/***
-Strings fuer die Quickhelp der View-PgUp/Down-Buttons
+Quickhelp strings for View-Up/Down buttons
***/
String STR_IMGBTN_NEXT_DOWN
{
@@ -307,11 +307,11 @@ String STR_IMGBTN_FTN_DOWN
};
String STR_IMGBTN_MARK_DOWN
{
-Text [ en-US ] = "Next Reminder" ;
+Text [ en-US ] = "Next reminder" ;
};
String STR_IMGBTN_POSTIT_DOWN
{
-Text [ en-US ] = "Next Note" ;
+Text [ en-US ] = "Next comment" ;
};
String STR_IMGBTN_SRCH_REP_DOWN
{
@@ -379,11 +379,11 @@ String STR_IMGBTN_FTN_UP
};
String STR_IMGBTN_MARK_UP
{
-Text [ en-US ] = "Previous Reminder" ;
+Text [ en-US ] = "Previous reminder" ;
};
String STR_IMGBTN_POSTIT_UP
{
-Text [ en-US ] = "Previous Note" ;
+Text [ en-US ] = "Previous comment" ;
};
String STR_IMGBTN_SRCH_REP_UP
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/sw ooo_custom_images/classic ooo_custom_images/industrial
default_images/sw/imglst/sc20175.png |binary default_images/sw/imglst/sc20186.png |binary default_images/sw/imglst/sch20175.png |binary default_images/sw/imglst/sch20186.png |binary ooo_custom_images/classic/classic_images.tar.gz|binary ooo_custom_images/industrial/sw/imglst/sc20175.png |binary ooo_custom_images/industrial/sw/imglst/sc20186.png |binary 7 files changed New commits: commit cde3abc07c361395d2641bbf1c6eb12858e287f4 Author: Matthias Seidel AuthorDate: Sat Jul 27 17:10:59 2019 + Commit: Matthias Seidel CommitDate: Sat Jul 27 17:10:59 2019 + Use correct icons for navigation up/down diff --git a/default_images/sw/imglst/sc20175.png b/default_images/sw/imglst/sc20175.png index b2c0c5e13911..86f642613bee 100644 Binary files a/default_images/sw/imglst/sc20175.png and b/default_images/sw/imglst/sc20175.png differ diff --git a/default_images/sw/imglst/sc20186.png b/default_images/sw/imglst/sc20186.png index 1d5658794522..5c75626e9525 100644 Binary files a/default_images/sw/imglst/sc20186.png and b/default_images/sw/imglst/sc20186.png differ diff --git a/default_images/sw/imglst/sch20175.png b/default_images/sw/imglst/sch20175.png index 06e01b67bbb8..2d766045efde 100644 Binary files a/default_images/sw/imglst/sch20175.png and b/default_images/sw/imglst/sch20175.png differ diff --git a/default_images/sw/imglst/sch20186.png b/default_images/sw/imglst/sch20186.png index a3fd98dc2a86..5c117bed0372 100644 Binary files a/default_images/sw/imglst/sch20186.png and b/default_images/sw/imglst/sch20186.png differ diff --git a/ooo_custom_images/classic/classic_images.tar.gz b/ooo_custom_images/classic/classic_images.tar.gz index 12106f894804..f83fa028b17d 100644 Binary files a/ooo_custom_images/classic/classic_images.tar.gz and b/ooo_custom_images/classic/classic_images.tar.gz differ diff --git a/ooo_custom_images/industrial/sw/imglst/sc20175.png b/ooo_custom_images/industrial/sw/imglst/sc20175.png index 0c8f07b3ffce..262f8f1e9eeb 100644 Binary files a/ooo_custom_images/industrial/sw/imglst/sc20175.png and b/ooo_custom_images/industrial/sw/imglst/sc20175.png differ diff --git a/ooo_custom_images/industrial/sw/imglst/sc20186.png b/ooo_custom_images/industrial/sw/imglst/sc20186.png index 3b6f27174155..52dea32d84f9 100644 Binary files a/ooo_custom_images/industrial/sw/imglst/sc20186.png and b/ooo_custom_images/industrial/sw/imglst/sc20186.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/svx default_images/sw ooo_custom_images/classic
default_images/svx/res/slidezoomin_11.png |binary default_images/svx/res/slidezoomout_11.png |binary default_images/sw/res/point.png |binary default_images/sw/res/point_h.png |binary ooo_custom_images/classic/classic_images.tar.gz |binary 5 files changed New commits: commit f160722c9cd8052c1b0c92c0e00783a9fe765dfa Author: Matthias Seidel AuthorDate: Fri Jul 26 23:50:48 2019 + Commit: Matthias Seidel CommitDate: Fri Jul 26 23:50:48 2019 + Updated graphics for (navigation) point diff --git a/default_images/sw/res/point.png b/default_images/sw/res/point.png index c58a792d8959..1c3c29421a27 100644 Binary files a/default_images/sw/res/point.png and b/default_images/sw/res/point.png differ diff --git a/default_images/sw/res/point_h.png b/default_images/sw/res/point_h.png index 75426c941aa9..c39971ffa840 100644 Binary files a/default_images/sw/res/point_h.png and b/default_images/sw/res/point_h.png differ diff --git a/ooo_custom_images/classic/classic_images.tar.gz b/ooo_custom_images/classic/classic_images.tar.gz index e9f8c1dd5ad3..c8f4085938e1 100644 Binary files a/ooo_custom_images/classic/classic_images.tar.gz and b/ooo_custom_images/classic/classic_images.tar.gz differ commit 16736eb5d0b408ff6068096e6751bd70c99c494e Author: Matthias Seidel AuthorDate: Fri Jul 26 23:23:53 2019 + Commit: Matthias Seidel CommitDate: Fri Jul 26 23:23:53 2019 + Updated graphics for zoom in/out diff --git a/default_images/svx/res/slidezoomin_11.png b/default_images/svx/res/slidezoomin_11.png index 1fb255901910..b39513376db5 100644 Binary files a/default_images/svx/res/slidezoomin_11.png and b/default_images/svx/res/slidezoomin_11.png differ diff --git a/default_images/svx/res/slidezoomout_11.png b/default_images/svx/res/slidezoomout_11.png index 131f45cfbe3e..c4fb23b27f67 100644 Binary files a/default_images/svx/res/slidezoomout_11.png and b/default_images/svx/res/slidezoomout_11.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - uui/source
uui/source/ids.src | 173 ++---
1 file changed, 73 insertions(+), 100 deletions(-)
New commits:
commit b40aa0ad86a48d66e7f77c88bba02c3882cd71e5
Author: Matthias Seidel
AuthorDate: Fri Jul 26 12:07:57 2019 +
Commit: Matthias Seidel
CommitDate: Fri Jul 26 12:07:57 2019 +
Cleaned up whitespace
diff --git a/uui/source/ids.src b/uui/source/ids.src
index 1fb5966df48a..4220fab53006 100644
--- a/uui/source/ids.src
+++ b/uui/source/ids.src
@@ -29,12 +29,12 @@
String RID_KEEP_PASSWORD
{
-Text [ en-US ] = "~Remember password until end of session";
+Text [ en-US ] = "~Remember password until end of session" ;
};
String RID_SAVE_PASSWORD
{
-Text [ en-US ] = "~Remember password";
+Text [ en-US ] = "~Remember password" ;
};
@@ -52,379 +52,352 @@ Resource RID_UUI_ERRHDL
{
String (ERRCODE_UUI_IO_ABORT & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "The operation executed on $(ARG1) was aborted.";
+Text [ en-US ] = "The operation executed on $(ARG1) was aborted." ;
};
String (ERRCODE_UUI_IO_ACCESSDENIED & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "Access to $(ARG1) was denied.";
+Text [ en-US ] = "Access to $(ARG1) was denied." ;
};
String (ERRCODE_UUI_IO_ALREADYEXISTS & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "$(ARG1) already exists.";
+Text [ en-US ] = "$(ARG1) already exists." ;
};
String (ERRCODE_UUI_IO_TARGETALREADYEXISTS & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "Target already exists.";
+Text [ en-US ] = "Target already exists." ;
};
String (ERRCODE_UUI_IO_MODULESIZEEXCEEDED & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "You are about to save/export a password protected
basic library containing module(s) \n$(ARG1)\nwhich are too large to store in
binary format. If you wish users that don't have access to the library password
to be able to run macros in those module(s) you must split those modules into a
number of smaller modules. Do you wish to continue to save/export this
library?" ;
+Text [ en-US ] = "You are about to save/export a password protected
basic library containing module(s)\n$(ARG1)\nwhich are too large to store in
binary format. If you wish users that don't have access to the library password
to be able to run macros in those module(s) you must split those modules into a
number of smaller modules. Do you wish to continue to save/export this
library?" ;
};
String (ERRCODE_UUI_IO_BADCRC & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "The data from $(ARG1) has an incorrect checksum.";
+Text [ en-US ] = "The data from $(ARG1) has an incorrect checksum." ;
};
String (ERRCODE_UUI_IO_CANTCREATE & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "The object $(ARG1) cannot be created in directory
$(ARG2).";
+Text [ en-US ] = "The object $(ARG1) cannot be created in directory
$(ARG2)." ;
};
String (ERRCODE_UUI_IO_CANTREAD & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "Data of $(ARG1) could not be read.";
+Text [ en-US ] = "Data of $(ARG1) could not be read." ;
};
String (ERRCODE_UUI_IO_CANTSEEK & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "The seek operation on $(ARG1) could not be
performed.";
+Text [ en-US ] = "The seek operation on $(ARG1) could not be
performed." ;
};
String (ERRCODE_UUI_IO_CANTTELL & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "The tell operation on $(ARG1) could not be
performed.";
+Text [ en-US ] = "The tell operation on $(ARG1) could not be
performed." ;
};
String (ERRCODE_UUI_IO_CANTWRITE & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "Data for $(ARG1) could not be written.";
+Text [ en-US ] = "Data for $(ARG1) could not be written." ;
};
String (ERRCODE_UUI_IO_CURRENTDIR & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "Action impossible: $(ARG1) is the current
directory.";
+Text [ en-US ] = "Action impossible: $(ARG1) is the current
directory." ;
};
String (ERRCODE_UUI_IO_NOTREADY & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "$(ARG1) is not ready.";
+Text [ en-US ] = "$(ARG1) is not ready." ;
};
String (ERRCODE_UUI_IO_NOTSAMEDEVICE & ERRCODE_RES_MASK)
{
-Text [ en-US ] = "Action impossible: $(ARG1) and $(ARG2) are different
devices (drives).";
+Text [ en-US ] = "Action impossible: $(ARG1) and $(ARG2) are different
devices (dri
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - ooo_custom_images/classic
ooo_custom_images/classic/classic_images.tar.gz |binary 1 file changed New commits: commit b387f6c7cdfe3769282ec9a8b71d6bcc87c8122a Author: Matthias Seidel AuthorDate: Wed Jul 24 10:03:37 2019 + Commit: Matthias Seidel CommitDate: Wed Jul 24 10:03:37 2019 + Added "old" graphics for zoom slider in/out to classic icon set diff --git a/ooo_custom_images/classic/classic_images.tar.gz b/ooo_custom_images/classic/classic_images.tar.gz index 02c56886f82f..e9f8c1dd5ad3 100644 Binary files a/ooo_custom_images/classic/classic_images.tar.gz and b/ooo_custom_images/classic/classic_images.tar.gz differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/sw ooo_custom_images/classic svx/source
default_images/sw/res/point.png |binary
ooo_custom_images/classic/classic_images.tar.gz |binary
svx/source/src/errtxt.src |2 +-
3 files changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c7e171a0440aa44b2003f9ddd3a5cebe85765953
Author: Matthias Seidel
AuthorDate: Sun Jul 21 15:51:28 2019 +
Commit: Matthias Seidel
CommitDate: Sun Jul 21 15:51:28 2019 +
Smaller corrections to my recent commits
diff --git a/default_images/sw/res/point.png b/default_images/sw/res/point.png
index 587f080e99de..c58a792d8959 100644
Binary files a/default_images/sw/res/point.png and
b/default_images/sw/res/point.png differ
diff --git a/ooo_custom_images/classic/classic_images.tar.gz
b/ooo_custom_images/classic/classic_images.tar.gz
index 425e06fcabb7..02c56886f82f 100644
Binary files a/ooo_custom_images/classic/classic_images.tar.gz and
b/ooo_custom_images/classic/classic_images.tar.gz differ
diff --git a/svx/source/src/errtxt.src b/svx/source/src/errtxt.src
index afef54975f14..d02fecac7816 100644
--- a/svx/source/src/errtxt.src
+++ b/svx/source/src/errtxt.src
@@ -474,7 +474,7 @@ Resource RID_ERRHDL
};
String ERRCODE_SFX_INCOMPLETE_ENCRYPTION
{
-Text [ en-US ] = "The encrypted document contains unexpected
non-encrypted streams.\n\nThis could be the result of document
manipulation.\n\nWe recommend that you do not trust the content of the current
document.\nExecution of macros is disabled for this document.\n" ;
+Text [ en-US ] = "The encrypted document contains unexpected
non-encrypted streams.\n\nThis could be the result of document
manipulation.\n\nWe recommend that you do not trust the content of the current
document.\nExecution of macros is disabled for this document.\n " ;
};
String ERRCODE_IO_INVALIDLENGTH
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/sw ooo_custom_images/classic packimages/pack sw/source
ooo_custom_images/classic/classic_images.tar.gz |binary
packimages/pack/image-sort.lst | 10 +--
sw/source/ui/ribbar/workctrl.src| 80 +---
3 files changed, 35 insertions(+), 55 deletions(-)
New commits:
commit 732a62d93c84fc8d403c7d252f210b5173c4be9d
Author: Matthias Seidel
AuthorDate: Sun Jul 21 11:59:22 2019 +
Commit: Matthias Seidel
CommitDate: Sun Jul 21 11:59:22 2019 +
Rename graphics (punkt->point), general cleanup
diff --git a/default_images/sw/res/punkt.png b/default_images/sw/res/point.png
similarity index 100%
rename from default_images/sw/res/punkt.png
rename to default_images/sw/res/point.png
diff --git a/default_images/sw/res/punkt_h.png
b/default_images/sw/res/point_h.png
similarity index 100%
rename from default_images/sw/res/punkt_h.png
rename to default_images/sw/res/point_h.png
diff --git a/ooo_custom_images/classic/classic_images.tar.gz
b/ooo_custom_images/classic/classic_images.tar.gz
index d01e3879e387..425e06fcabb7 100644
Binary files a/ooo_custom_images/classic/classic_images.tar.gz and
b/ooo_custom_images/classic/classic_images.tar.gz differ
diff --git a/packimages/pack/image-sort.lst b/packimages/pack/image-sort.lst
index d7a615be3bda..b66eeaf55de4 100644
--- a/packimages/pack/image-sort.lst
+++ b/packimages/pack/image-sort.lst
@@ -1,9 +1,9 @@
#
# This file exists to help improve the ordering of
-# icons inside the OO.o theme / images.zip file.
+# icons inside the AOO theme / images.zip file.
#
# Sections are processed together, and are delimited
-# by '-- [small]' a 'group' tage denotes equal
+# by '-- [small]' a 'group' tag denotes equal
# importance: icons must be interleaved, 'ordered'
# denotes a simple best-fit order. 'literal' denotes
# a list of explicit image loads
@@ -11,8 +11,8 @@
res/mainapp_16.png
res/mainapp_32.png
-sw/res/punkt.png
-sw/res/punkt_h.png
+sw/res/point.png
+sw/res/point_h.png
res/sx03251.png
res/lx03251.png
@@ -46,7 +46,7 @@ svtools/res/bmpfont.png
svtools/res/scalfont.png
svx/res/signet_11x16.png
svx/res/caution_11x16.png
-svx/res/notcertificate_16.png
+svx/res/notcertificate_11x16.png
res/sc10223.png
res/sc10224.png
res/sx03250.png
diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src
index aa3321fd4294..b0e21b0b4ba1 100644
--- a/sw/source/ui/ribbar/workctrl.src
+++ b/sw/source/ui/ribbar/workctrl.src
@@ -47,7 +47,7 @@ Menu RID_INSERT_FIELD_CTRL
HelpId = CMD_FN_INSERT_FLD_TIME ;
Text [ en-US ] = "Time" ;
};
- //#ifndef MN_SW_WEB
+//#ifndef MN_SW_WEB
MenuItem
{
Identifier = FN_INSERT_FLD_PGNUMBER ;
@@ -72,7 +72,7 @@ Menu RID_INSERT_FIELD_CTRL
HelpId = CMD_FN_INSERT_FLD_TITLE ;
Text [ en-US ] = "Title" ;
};
- //#endif
+//#endif
MenuItem
{
Identifier = FN_INSERT_FLD_AUTHOR ;
@@ -91,7 +91,7 @@ Menu RID_INSERT_FIELD_CTRL
};
};
};
-#define SCROLL_IMAGE_IDLIST \
+#define SCROLL_IMAGE_IDLIST \
IdList =\
{ \
NID_NEXT ; \
@@ -111,9 +111,9 @@ Menu RID_INSERT_FIELD_CTRL
NID_MARK ; \
NID_POSTIT ;\
NID_SRCH_REP ; \
-NID_INDEX_ENTRY;\
-NID_TABLE_FORMULA; \
-NID_TABLE_FORMULA_ERROR;\
+NID_INDEX_ENTRY ; \
+NID_TABLE_FORMULA ; \
+NID_TABLE_FORMULA_ERROR ; \
}; \
IdCount = { 20 ; };
@@ -126,26 +126,26 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN
HelpID = HID_INSERT_CTRL ;
ImageList IL_VALUES
{
-Prefix = "sr";
+Prefix = "sr" ;
MaskColor = IMAGE_MASK_COLOR ;
SCROLL_IMAGE_IDLIST
};
ImageList ILH_VALUES
{
-Prefix = "srh";
+Prefix = "srh" ;
MaskColor = IMAGE_MASK_COLOR ;
SCROLL_IMAGE_IDLIST
};
FixedLine FL_SEP
{
//no position, no text
-Size = MAP_APPFONT ( 20 , 4 ) ;
+Size = MAP_APPFONT ( 20, 4 ) ;
};
FixedText FI_INFO
{
//no position, no text
-Size = MAP_APPFONT ( 20 , 8 ) ;
-Center = TRUE;
+Size = MAP_APPFONT ( 20, 8 ) ;
+Center = TRUE ;
};
String ST_TBL
{
@@ -185,7 +185,6 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN
};
String ST_OUTL
{
-/* ### ACHTUNG: Neuer Text in Resource? �berschrift : �berschrift */
Text [ en-US ] = "Headings" ;
};
String ST_SEL
@@ -194,7 +193,6 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN
};
String ST_FTN
{
-/* ### ACHTUNG: Neuer T
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/sw
default_images/sw/res/punkt.png |binary default_images/sw/res/punkt_h.png |binary 2 files changed New commits: commit d574acfca286e8d3b9d73559664294a6b2c3d86d Author: Matthias Seidel AuthorDate: Sat Jul 20 22:46:55 2019 + Commit: Matthias Seidel CommitDate: Sat Jul 20 22:46:55 2019 + Updated graphics (navigation) diff --git a/default_images/sw/res/punkt.png b/default_images/sw/res/punkt.png index c5870270382d..587f080e99de 100644 Binary files a/default_images/sw/res/punkt.png and b/default_images/sw/res/punkt.png differ diff --git a/default_images/sw/res/punkt_h.png b/default_images/sw/res/punkt_h.png index 9902f58db1e3..75426c941aa9 100644 Binary files a/default_images/sw/res/punkt_h.png and b/default_images/sw/res/punkt_h.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx
include/svx/strings.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ba443157b125f1550032ffbb5a57aed835f3e334
Author: Matthias Seidel
AuthorDate: Thu Jul 18 00:48:52 2019 -0500
Commit: Adolfo Jayme Barrientos
CommitDate: Thu Jul 18 00:48:52 2019 -0500
Fix the awkward grammar of a translatable string
(cherry picked from commit e8d5f4b7d65f1e0d1d161a36f3c9b9c5866d009a)
Change-Id: I4d3a55b2d161ad23ccf6c68c0af17f1f99ebea43
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 351da5886e29..6690d18a2b48 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1231,7 +1231,7 @@
#define RID_SVXSTR_INSERT_TEXT
NC_("RID_SVXSTR_INSERT_TEXT", "Insert")
#define RID_SVXSTR_XMLSEC_SIG_OK
NC_("RID_SVXSTR_XMLSEC_SIG_OK", "Digital Signature: The document signature is
OK.")
#define RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY
NC_("RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY", "Digital Signature: The document
signature is OK, but the certificates could not be validated.")
-#define RID_SVXSTR_XMLSEC_SIG_NOT_OK
NC_("RID_SVXSTR_XMLSEC_SIG_NOT_OK", "Digital Signature: The document signature
does not match the document content. We strongly recommend you to do not trust
this document.")
+#define RID_SVXSTR_XMLSEC_SIG_NOT_OK
NC_("RID_SVXSTR_XMLSEC_SIG_NOT_OK", "Digital Signature: The document signature
does not match the document content. We strongly recommend you not to trust
this document.")
#define RID_SVXSTR_XMLSEC_NO_SIG
NC_("RID_SVXSTR_XMLSEC_NO_SIG", "Digital Signature: The document is not
signed.")
#define RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG
NC_("RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG", "Digital Signature: The
document signature and the certificate are OK, but not all parts of the
document are signed.")
#define RID_SVXSTR_DOC_MODIFIED_YES
NC_("RID_SVXSTR_DOC_MODIFIED_YES", "The document has been modified. Click to
save the document.")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - xmlsecurity/source
xmlsecurity/source/dialogs/digitalsignaturesdialog.src | 21 -
1 file changed, 10 insertions(+), 11 deletions(-)
New commits:
commit 6bc9d14f4eb1c0511038a43a67f219108c4f3feb
Author: Matthias Seidel
AuthorDate: Tue Jul 16 12:47:50 2019 +
Commit: Matthias Seidel
CommitDate: Tue Jul 16 12:47:50 2019 +
Make dialog wider
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
index 6a97db972cdb..37e4298071c1 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
@@ -28,7 +28,7 @@
ModalDialog RID_XMLSECDLG_DIGSIG
{
HelpId = HID_XMLSEC_DLG_DIGSIG ;
-Size = MAP_APPFONT ( 234, 191 ) ;
+Size = MAP_APPFONT ( 249, 191 ) ;
OutputSize = TRUE ;
Closeable = TRUE ;
Moveable = TRUE ;
@@ -61,7 +61,7 @@ ModalDialog RID_XMLSECDLG_DIGSIG
{
HelpId = HID_XMLSEC_CTRL_SIGNATURESDLG ;
Pos = MAP_APPFONT ( 6, 14 ) ;
-Size = MAP_APPFONT ( 222, 109 ) ;
+Size = MAP_APPFONT ( 237, 109 ) ;
SVLook = TRUE ;
Border = TRUE ;
};
@@ -140,32 +140,32 @@ ModalDialog RID_XMLSECDLG_DIGSIG
{
HelpID = "xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_VIEWCERT" ;
Pos = MAP_APPFONT ( 6, 142 ) ;
-Size = MAP_APPFONT ( 70, 14 ) ;
+Size = MAP_APPFONT ( 75, 14 ) ;
Text [ en-US ] = "View Certificate..." ;
};
PushButton BTN_ADDCERT
{
HelpID = "xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_ADDCERT" ;
-Pos = MAP_APPFONT ( 82, 142 ) ;
-Size = MAP_APPFONT ( 70, 14 ) ;
+Pos = MAP_APPFONT ( 87, 142 ) ;
+Size = MAP_APPFONT ( 75, 14 ) ;
Text [ en-US ] = "Sign Document..." ;
};
PushButton BTN_REMOVECERT
{
HelpID = "xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_REMOVECERT" ;
-Pos = MAP_APPFONT ( 158, 142 ) ;
-Size = MAP_APPFONT ( 70, 14 ) ;
+Pos = MAP_APPFONT ( 168, 142 ) ;
+Size = MAP_APPFONT ( 75, 14 ) ;
Text [ en-US ] = "Remove" ;
};
FixedLine FL_BOTTOM_SEP
{
Pos = MAP_APPFONT ( 0, 160 ) ;
-Size = MAP_APPFONT ( 234, 8 ) ;
+Size = MAP_APPFONT ( 249, 8 ) ;
};
OKButton BTN_OK
{
DefButton = TRUE;
-Pos = MAP_APPFONT ( 178, 171 ) ;
+Pos = MAP_APPFONT ( 193, 171 ) ;
Size = MAP_APPFONT ( 50, 14 ) ;
Text [ en-US ] = "Close" ;
};
@@ -193,8 +193,7 @@ ErrorBox RID_XMLSECDLG_OLD_ODF_FORMAT
{
Buttons = WB_OK ;
DefButton = WB_DEF_OK ;
-Message [ en-US ] = "This document contains signatures in ODF 1.1 format.
Signing documents in %PRODUCTNAME %PRODUCTVERSION requires ODF 1.2 format
version. "
-"Thus no signatures can be added or removed to this
document.\n\nSave document in ODF 1.2 format and add all desired signatures
again." ;
+Message [ en-US ] = "This document contains signatures in ODF 1.1 format.
Signing documents in %PRODUCTNAME %PRODUCTVERSION requires ODF 1.2 format
version. Thus no signatures can be added or removed to this document.\n\nSave
document in ODF 1.2 format and add all desired signatures again." ;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source xmlsecurity/source
svx/source/stbctrls/stbctrls.src |2
xmlsecurity/source/dialogs/certificatechooser.src | 58 +++---
xmlsecurity/source/dialogs/warnings.src | 91 +++---
3 files changed, 77 insertions(+), 74 deletions(-)
New commits:
commit dbe83f86f2830e0544a0fb3929f485c51c569716
Author: Matthias Seidel
AuthorDate: Mon Jul 15 23:28:51 2019 +
Commit: Matthias Seidel
CommitDate: Mon Jul 15 23:28:51 2019 +
Cleaned up whitespace, minor changes
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 6886c1539725..31409c145dd8 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -72,7 +72,7 @@ String RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY
String RID_SVXSTR_XMLSEC_SIG_NOT_OK
{
-Text [ en-US ] = "Digital Signature: The document signature does not match
the document content. We strongly recommend you not to trust this document." ;
+Text [ en-US ] = "Digital Signature: The document signature does not match
the document content. We strongly recommend that you do not trust this
document." ;
};
String RID_SVXSTR_XMLSEC_NO_SIG
diff --git a/xmlsecurity/source/dialogs/certificatechooser.src
b/xmlsecurity/source/dialogs/certificatechooser.src
index ddb259d95411..11759d544142 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.src
+++ b/xmlsecurity/source/dialogs/certificatechooser.src
@@ -27,58 +27,60 @@
ModalDialog RID_XMLSECDLG_CERTCHOOSER
{
HelpId = HID_XMLSEC_DLG_CERTCHOOSER;
-Size = MAP_APPFONT( CS_WIDTH, CS_HEIGHT );
-OutputSize = TRUE;
-Closeable = TRUE;
-Moveable = TRUE;
-SVLook = TRUE;
+Size = MAP_APPFONT ( CS_WIDTH, CS_HEIGHT ) ;
+OutputSize = TRUE ;
+Closeable = TRUE ;
+Moveable = TRUE ;
+SVLook = TRUE ;
-Text [ en-US ] = "Select Certificate";
+Text [ en-US ] = "Select Certificate" ;
FixedText FT_HINT_SELECT
{
-Pos = MAP_APPFONT( CS_COL_0, CS_ROW_0 );
-Size = MAP_APPFONT( CS_COL_2-CS_COL_0, RSC_CD_FIXEDTEXT_HEIGHT );
-Text [ en-US ] = "Select the certificate you want to use for signing";
+Pos = MAP_APPFONT ( CS_COL_0, CS_ROW_0 ) ;
+Size = MAP_APPFONT ( CS_COL_2-CS_COL_0, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+Text [ en-US ] = "Select the certificate you want to use for signing" ;
};
Control LB_SIGNATURES
{
-HelpId = HID_XMLSEC_CTRL_CHOOSESIGNATURES;
-Pos = MAP_APPFONT( CS_COL_0, CS_ROW_1 );
-Size = MAP_APPFONT( CS_LB_WIDTH, CS_ROW_2-CS_ROW_1 );
-SVLook = TRUE;
-Border = TRUE;
+HelpId = HID_XMLSEC_CTRL_CHOOSESIGNATURES ;
+Pos = MAP_APPFONT ( CS_COL_0, CS_ROW_1 ) ;
+Size = MAP_APPFONT ( CS_LB_WIDTH, CS_ROW_2-CS_ROW_1 ) ;
+SVLook = TRUE ;
+Border = TRUE ;
};
String STR_HEADERBAR
{
-Text [ en-US ] = "Issued to\tIssued by\tExpiration date";
+Text [ en-US ] = "Issued to\tIssued by\tExpiration date" ;
};
PushButton BTN_VIEWCERT
{
-HelpID =
"xmlsecurity:PushButton:RID_XMLSECDLG_CERTCHOOSER:BTN_VIEWCERT";
-Pos = MAP_APPFONT( CS_COL_1, CS_ROW_3 );
-Size = MAP_APPFONT( CS_COL_2-CS_COL_1, RSC_CD_PUSHBUTTON_HEIGHT );
-Text [ en-US ] = "View Certificate...";
+HelpID =
"xmlsecurity:PushButton:RID_XMLSECDLG_CERTCHOOSER:BTN_VIEWCERT" ;
+Pos = MAP_APPFONT ( CS_COL_1, CS_ROW_3 ) ;
+Size = MAP_APPFONT ( CS_COL_2-CS_COL_1, RSC_CD_PUSHBUTTON_HEIGHT ) ;
+Text [ en-US ] = "View Certificate..." ;
};
FixedLine FL_BOTTOM_SEP
{
-Pos = MAP_APPFONT( 0, DLGS_BOTTOM_FL_Y( CS_HEIGHT ) );
-Size = MAP_APPFONT( CS_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
+Pos = MAP_APPFONT ( 0, DLGS_BOTTOM_FL_Y( CS_HEIGHT ) ) ;
+Size = MAP_APPFONT ( CS_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
};
OKButton BTN_OK
{
-DefButton = TRUE;
-Pos = MAP_APPFONT( DLGS_BOTTOM_OK_X( CS_WIDTH ), DLGS_BOTTOM_BTN_Y(
CS_HEIGHT ) );
-Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
);
+DefButton = TRUE ;
+Pos = MAP_APPFONT ( DLGS_BOTTOM_OK_X( CS_WIDTH ), DLGS_BOTTOM_BTN_Y(
CS_HEIGHT ) ) ;
+Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
) ;
};
CancelButton BTN_CANCEL
{
-Pos = MAP_APPFONT( DLGS_BOTTOM_CANCEL_X( CS_WIDTH ),
DLGS_BOTTOM_BTN_Y( CS_HEIGHT ) );
-Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
);
+Pos = MAP_APPFONT ( DLGS_BOTTOM_CANCEL_X( CS_WIDTH ),
DLGS_BOTTOM_BTN_Y( CS_HEIGHT ) ) ;
+Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
) ;
};
HelpButton BTN_HELP
{
-Pos = MAP_APPFONT( DLGS_BOTTOM_HELP_X( CS_WIDTH ), DLGS_BOTTO
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/svx default_images/xmlsecurity ooo_custom_images/classic svx/source xmlsecurity/source
default_images/svx/res/notcertificate_11x16.png |binary
default_images/svx/res/notcertificate_11x16_h.png |binary
default_images/svx/res/signet_11x16.png |binary
default_images/svx/res/signet_11x16_h.png |binary
default_images/xmlsecurity/res/notcertificate_11x16.png |binary
default_images/xmlsecurity/res/notcertificate_11x16_h.png |binary
default_images/xmlsecurity/res/signet_11x16.png |binary
default_images/xmlsecurity/res/signet_11x16_h.png |binary
ooo_custom_images/classic/classic_images.tar.gz |binary
svx/source/stbctrls/stbctrls.src |6 +++---
xmlsecurity/source/dialogs/digitalsignaturesdialog.src|6 +++---
11 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit e8d5f4b7d65f1e0d1d161a36f3c9b9c5866d009a
Author: Matthias Seidel
AuthorDate: Mon Jul 15 16:03:07 2019 +
Commit: Matthias Seidel
CommitDate: Mon Jul 15 16:03:07 2019 +
Added graphics for document signature
diff --git a/default_images/svx/res/notcertificate_11x16.png
b/default_images/svx/res/notcertificate_11x16.png
new file mode 100644
index ..f4d24a6e4cfb
Binary files /dev/null and b/default_images/svx/res/notcertificate_11x16.png
differ
diff --git a/default_images/svx/res/notcertificate_11x16_h.png
b/default_images/svx/res/notcertificate_11x16_h.png
new file mode 100644
index ..11210166492d
Binary files /dev/null and b/default_images/svx/res/notcertificate_11x16_h.png
differ
diff --git a/default_images/xmlsecurity/res/notcertificate_11x16.png
b/default_images/xmlsecurity/res/notcertificate_11x16.png
new file mode 100644
index ..f4d24a6e4cfb
Binary files /dev/null and
b/default_images/xmlsecurity/res/notcertificate_11x16.png differ
diff --git a/default_images/xmlsecurity/res/notcertificate_11x16_h.png
b/default_images/xmlsecurity/res/notcertificate_11x16_h.png
new file mode 100644
index ..11210166492d
Binary files /dev/null and
b/default_images/xmlsecurity/res/notcertificate_11x16_h.png differ
diff --git a/ooo_custom_images/classic/classic_images.tar.gz
b/ooo_custom_images/classic/classic_images.tar.gz
index 561eedb495d5..d01e3879e387 100644
Binary files a/ooo_custom_images/classic/classic_images.tar.gz and
b/ooo_custom_images/classic/classic_images.tar.gz differ
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 9a3b56aae9f6..6886c1539725 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -72,7 +72,7 @@ String RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY
String RID_SVXSTR_XMLSEC_SIG_NOT_OK
{
-Text [ en-US ] = "Digital Signature: The document signature does not match
the document content. We strongly recommend you to do not trust this document."
;
+Text [ en-US ] = "Digital Signature: The document signature does not match
the document content. We strongly recommend you not to trust this document." ;
};
String RID_SVXSTR_XMLSEC_NO_SIG
@@ -236,7 +236,7 @@ Image RID_SVXBMP_SIGNET_NOTVALIDATED
{
ImageBitmap = Bitmap
{
-File = "notcertificate_16.png" ;
+File = "notcertificate_11x16.png" ;
};
};
Image RID_SVXBMP_SIGNET_H
@@ -257,7 +257,7 @@ Image RID_SVXBMP_SIGNET_NOTVALIDATED_H
{
ImageBitmap = Bitmap
{
-File = "notcertificate_16_h.png" ;
+File = "notcertificate_11x16_h.png" ;
};
};
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
index 09b09b149f86..6a97db972cdb 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
@@ -127,7 +127,7 @@ ModalDialog RID_XMLSECDLG_DIGSIG
Size = MAP_APPFONT ( 33, 22 ) ;
Fixed = Image
{
-ImageBitmap = Bitmap { File = "notcertificate_16.png"; } ;
+ImageBitmap = Bitmap { File = "notcertificate_11x16.png"; } ;
};
};
FixedText FI_STATE_NOTVALIDATED
@@ -184,7 +184,7 @@ ModalDialog RID_XMLSECDLG_DIGSIG
};
Image IMG_STATE_NOTVALIDATED_HC
{
-ImageBitmap = Bitmap { File = "notcertificate_16_h.png"; } ;
+ImageBitmap = Bitmap { File = "notcertificate_11x16_h.png"; } ;
};
};
@@ -194,7 +194,7 @@ ErrorBox RID_XMLSECDLG_OLD_ODF_FORMAT
Buttons = WB_OK ;
DefButton = WB_DEF_OK ;
Message [ en-US ] = "This document contains signatures in ODF 1.1 format.
Signing documents in %PRODUCTNAME %PRODUCTVERSION requires ODF 1.2 format
version. "
-"Thus no signatures can be added or removed to this document.\n\nSave
document in ODF 1.2 format and add all desired signatures again." ;
+"Thus no signatures can be ad
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - xmlsecurity/source
xmlsecurity/source/dialogs/certificateviewer.src | 271 -
xmlsecurity/source/dialogs/digitalsignaturesdialog.src | 165 --
2 files changed, 210 insertions(+), 226 deletions(-)
New commits:
commit fbb5d37183ff0d0fb63bce50d0a2fb06b24b733d
Author: Matthias Seidel
AuthorDate: Sun Jul 14 13:40:07 2019 +
Commit: Matthias Seidel
CommitDate: Sun Jul 14 13:40:07 2019 +
Cleaned up whitespace, removed MASKCOLOR
diff --git a/xmlsecurity/source/dialogs/certificateviewer.src
b/xmlsecurity/source/dialogs/certificateviewer.src
index 17d06eb6b642..0e9eda4bafbb 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.src
+++ b/xmlsecurity/source/dialogs/certificateviewer.src
@@ -19,328 +19,321 @@
*
*/
+
#include "dialogs.hrc"
#include "helpids.hrc"
TabDialog RID_XMLSECDLG_CERTVIEWER
{
-HelpID = HID_XMLSEC_DLG_CERTVIEWER;
-Size = MAP_APPFONT( TD_WIDTH, TD_HEIGHT );
-OutputSize = TRUE;
-Closeable = TRUE;
-Moveable = TRUE;
-SVLook = TRUE;
+HelpID = HID_XMLSEC_DLG_CERTVIEWER ;
+Size = MAP_APPFONT ( TD_WIDTH, TD_HEIGHT ) ;
+OutputSize = TRUE ;
+Closeable = TRUE ;
+Moveable = TRUE ;
+SVLook = TRUE ;
-Text [ en-US ] = "View Certificate";
+Text [ en-US ] = "View Certificate" ;
TabControl 1
{
-Pos = MAP_APPFONT( TD_SP_INNERBORDER_LEFT, TD_SP_INNERBORDER_TOP );
-Size = MAP_APPFONT( TP_WIDTH, TP_HEIGHT+RIDDER_HEIGHT );
+Pos = MAP_APPFONT ( TD_SP_INNERBORDER_LEFT, TD_SP_INNERBORDER_TOP ) ;
+Size = MAP_APPFONT ( TP_WIDTH, TP_HEIGHT+RIDDER_HEIGHT ) ;
SVLook = TRUE ;
PageList =
{
PageItem
{
-Identifier = RID_XMLSECTP_GENERAL;
-Text [ en-US ] = "General";
+Identifier = RID_XMLSECTP_GENERAL ;
+Text [ en-US ] = "General" ;
};
PageItem
{
-Identifier = RID_XMLSECTP_DETAILS;
-Text [ en-US ] = "Details";
+Identifier = RID_XMLSECTP_DETAILS ;
+Text [ en-US ] = "Details" ;
};
PageItem
{
-Identifier = RID_XMLSECTP_CERTPATH;
-Text [ en-US ] = "Certification Path";
+Identifier = RID_XMLSECTP_CERTPATH ;
+Text [ en-US ] = "Certification Path" ;
};
};
};
OKButton BTN_OK
{
-Pos = MAP_APPFONT( CV_COL_A, CV_ROW_A );
-Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
);
-DefButton = TRUE;
+Pos = MAP_APPFONT ( CV_COL_A, CV_ROW_A ) ;
+Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
) ;
+DefButton = TRUE ;
};
HelpButton BTN_HELP
{
-Pos = MAP_APPFONT( CV_COL_C, CV_ROW_A );
-Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
);
+Pos = MAP_APPFONT ( CV_COL_C, CV_ROW_A ) ;
+Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
) ;
};
};
TabPage RID_XMLSECTP_GENERAL
{
-HelpId = HID_XMLSEC_TP_GENERAL;
-Size = MAP_APPFONT( TP_WIDTH, TP_HEIGHT );
-OutputSize = TRUE;
-Hide = TRUE;
-SVLook = TRUE;
+HelpId = HID_XMLSEC_TP_GENERAL ;
+Size = MAP_APPFONT ( TP_WIDTH, TP_HEIGHT ) ;
+OutputSize = TRUE ;
+Hide = TRUE ;
+SVLook = TRUE ;
Window WIN_FRAME
{
-SVLook = TRUE;
-Border = TRUE;
-Pos = MAP_APPFONT( CV_COL_0, CV_ROW_0 );
-Size = MAP_APPFONT( CV_CONT_WIDTH, CV_CONT_HEIGHT );
+SVLook = TRUE ;
+Border = TRUE ;
+Pos = MAP_APPFONT ( CV_COL_0, CV_ROW_0 ) ;
+Size = MAP_APPFONT ( CV_CONT_WIDTH, CV_CONT_HEIGHT ) ;
};
FixedImage IMG_CERT
{
-Pos = MAP_APPFONT( CW_COL_0, CW_ROW_0 );
-Size = MAP_APPFONT( IMG1_WIDTH, IMG1_HEIGHT );
+Pos = MAP_APPFONT ( CW_COL_0, CW_ROW_0 ) ;
+Size = MAP_APPFONT ( IMG1_WIDTH, IMG1_HEIGHT ) ;
Fixed = Image
{
-ImageBitmap = Bitmap { File = "certificate_40x56.png"; };
-MaskColor = STD_MASKCOLOR;
+ImageBitmap = Bitmap { File = "certificate_40x56.png"; } ;
};
};
FixedText FI_CERTINFO
{
-Pos = MAP_APPFONT( CW_COL_3, CW_ROW_1 );
-Size = MAP_APPFONT( CW_COL_5-CW_COL_3, RSC_CD_FIXEDTEXT_HEIGHT );
-Text [ en-US ] = " Certificate Information";
+Pos = MAP_APPFONT ( CW_COL_3, CW_ROW_1 ) ;
+Size = MAP_APPFONT ( CW_COL_5-CW_COL_3, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+Text [ en-US ] = " Certificate Information" ;
};
FixedLine FL_SEP1
{
-Pos = MAP_APPFONT( CW_C
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/svx svx/source
default_images/svx/res/slidezoomin_11.png|binary
default_images/svx/res/slidezoomin_11_h.png |binary
default_images/svx/res/slidezoomout_11.png |binary
default_images/svx/res/slidezoomout_11_h.png |binary
svx/source/stbctrls/stbctrls.src | 64 ++-
5 files changed, 25 insertions(+), 39 deletions(-)
New commits:
commit b8a3c50b267ab2fa02778659b57cf44149f29e4a
Author: Matthias Seidel
AuthorDate: Sat Jul 13 09:13:40 2019 +
Commit: Matthias Seidel
CommitDate: Sat Jul 13 09:13:40 2019 +
Flattened graphics for zoom in/out: Next step incl. high contrast
diff --git a/default_images/svx/res/slidezoomin_11.png
b/default_images/svx/res/slidezoomin_11.png
index c02ef45f6742..1fb255901910 100644
Binary files a/default_images/svx/res/slidezoomin_11.png and
b/default_images/svx/res/slidezoomin_11.png differ
diff --git a/default_images/svx/res/slidezoomin_11_h.png
b/default_images/svx/res/slidezoomin_11_h.png
index 94f5b66d6b5a..4a243d521db3 100644
Binary files a/default_images/svx/res/slidezoomin_11_h.png and
b/default_images/svx/res/slidezoomin_11_h.png differ
diff --git a/default_images/svx/res/slidezoomout_11.png
b/default_images/svx/res/slidezoomout_11.png
index 11c82caec4f6..131f45cfbe3e 100644
Binary files a/default_images/svx/res/slidezoomout_11.png and
b/default_images/svx/res/slidezoomout_11.png differ
diff --git a/default_images/svx/res/slidezoomout_11_h.png
b/default_images/svx/res/slidezoomout_11_h.png
index 88535e8f2344..cca0a6e4ff42 100644
Binary files a/default_images/svx/res/slidezoomout_11_h.png and
b/default_images/svx/res/slidezoomout_11_h.png differ
commit 4ad989c9360daeae46c4aa2981c903f0b6a7fff9
Author: Matthias Seidel
AuthorDate: Sat Jul 13 09:03:19 2019 +
Commit: Matthias Seidel
CommitDate: Sat Jul 13 09:03:19 2019 +
Cleaned up whitespace, removed MASKCOLOR, translated German comments, added
strings to translation
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index c02f38e07efb..9a3b56aae9f6 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -19,72 +19,73 @@
*
*/
+
- // include ---
+// include ---
#include
#include "helpid.hrc"
#include "stbctrls.h"
- // pragma
+// pragma
- // Strings ---
+// Strings ---
String RID_SVXSTR_INSERT_TEXT
{
- // 'Einf"ugen' bzw. 'Insert' abgek"urzt auf h"ochstens 5 Zeichen
+// 'Insert' shortened to max. 5 characters
Text [ en-US ] = "INSRT" ;
};
String RID_SVXSTR_OVERWRITE_TEXT
{
- // '"Uberschreiben' bzw. 'Overwrite' abgek"urzt auf h"ochstens 5 Zeichen
+// 'Overwrite' shortened to max. 5 characters
Text [ en-US ] = "OVER" ;
};
String RID_SVXSTR_SELMODE_STD
{
- // 'Standard' abgek"urzt auf h"ochstens 3 Zeichen
+// 'Standard' shortened to max. 3 characters
Text [ en-US ] = "STD" ;
};
String RID_SVXSTR_SELMODE_ER
{
- // 'Erweitert' bzw. 'Extended' abgek"urzt auf h"ochstens 3 Zeichen
+// 'Extended' shortened to max. 3 characters
Text [ en-US ] = "EXT" ;
};
String RID_SVXSTR_SELMODE_ERG
{
- // 'Erg"anzend' bzw. 'Added' abgek"urzt auf h"ochstens 3 Zeichen
+// 'Added' shortened to max. 3 characters
Text [ en-US ] = "ADD" ;
};
String RID_SVXSTR_SELMODE_BLK
{
- // 'Block' shortened to max. 3 chararcters
+// 'Block' shortened to max. 3 characters
Text [ en-US ] = "BLK" ;
};
String RID_SVXSTR_XMLSEC_SIG_OK
{
-Text [ en-US ] = "Digital Signature: The document signature is OK.";
+Text [ en-US ] = "Digital Signature: The document signature is OK." ;
};
String RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY
{
-Text [ en-US ] = "Digital Signature: The document signature is OK, but the
certificates could not be validated.";
+Text [ en-US ] = "Digital Signature: The document signature is OK, but the
certificates could not be validated." ;
};
String RID_SVXSTR_XMLSEC_SIG_NOT_OK
{
-Text [ en-US ] = "Digital Signature: The document signature does not match
the document content. We strongly recommend you to do not trust this document.";
+Text [ en-US ] = "Digital Signature: The document signature does not match
the document content. We strongly recommend you to do not trust this document."
;
};
String RID_SVXSTR_XMLSEC_NO_SIG
{
-Text [ en-U
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/svx
default_images/svx/res/slidezoomin_11.png |binary default_images/svx/res/slidezoomout_11.png |binary 2 files changed New commits: commit 800a23a9820defe9d5b5d3f880f59605ab9bdbd7 Author: Matthias Seidel AuthorDate: Fri Jul 12 13:42:40 2019 + Commit: Matthias Seidel CommitDate: Fri Jul 12 13:42:40 2019 + Flattened graphics for zoom in/out diff --git a/default_images/svx/res/slidezoomin_11.png b/default_images/svx/res/slidezoomin_11.png index deee8a81af59..c02ef45f6742 100644 Binary files a/default_images/svx/res/slidezoomin_11.png and b/default_images/svx/res/slidezoomin_11.png differ diff --git a/default_images/svx/res/slidezoomout_11.png b/default_images/svx/res/slidezoomout_11.png index 06c71288017e..11c82caec4f6 100644 Binary files a/default_images/svx/res/slidezoomout_11.png and b/default_images/svx/res/slidezoomout_11.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source
svx/source/stbctrls/zoomsliderctrl.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e5b45ca01299769ffa8378835e54012c57ce82b1 Author: Matthias Seidel AuthorDate: Fri Jul 12 10:54:53 2019 + Commit: Matthias Seidel CommitDate: Fri Jul 12 10:54:53 2019 + Make zoom slider "flat" diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 59ee0a116151..6b075987d85f 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -310,8 +310,8 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt ) Rectangle aRight( aSlider ); aRight.Left() = aRight.Right(); -pDev->SetLineColor( Color ( COL_WHITE ) ); -pDev->SetFillColor( Color ( COL_WHITE ) ); +pDev->SetLineColor( Color ( COL_GRAY ) ); +pDev->SetFillColor( Color ( COL_GRAY ) ); pDev->DrawRect( aSecondLine ); pDev->DrawRect( aRight ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - starmath/source
starmath/source/toolbox.hrc | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) New commits: commit 20b287b38529ab1d49c5dbe3b9c562bbb632713b Author: Matthias Seidel AuthorDate: Thu Jul 11 10:14:48 2019 + Commit: Matthias Seidel CommitDate: Thu Jul 11 10:14:48 2019 + Cleaned up whitespace diff --git a/starmath/source/toolbox.hrc b/starmath/source/toolbox.hrc index d953c11ed716..1c391cd60f19 100755 --- a/starmath/source/toolbox.hrc +++ b/starmath/source/toolbox.hrc @@ -25,18 +25,17 @@ #define _TOOLBOX_HRC_ #define FL_TOOLBOX_CAT_DELIM1 -#define TOOLBOX_CATALOG 10 -#define TOOLBOX_CAT_A 11 -#define TOOLBOX_CAT_B 12 -#define TOOLBOX_CAT_C 13 -#define TOOLBOX_CAT_D 14 -#define TOOLBOX_CAT_E 15 -#define TOOLBOX_CAT_F 16 -#define TOOLBOX_CAT_G 17 -#define TOOLBOX_CAT_H 18 -#define TOOLBOX_CAT_I 19 +#define TOOLBOX_CATALOG 10 +#define TOOLBOX_CAT_A 11 +#define TOOLBOX_CAT_B 12 +#define TOOLBOX_CAT_C 13 +#define TOOLBOX_CAT_D 14 +#define TOOLBOX_CAT_E 15 +#define TOOLBOX_CAT_F 16 +#define TOOLBOX_CAT_G 17 +#define TOOLBOX_CAT_H 18 +#define TOOLBOX_CAT_I 19 -#define NUM_TBX_CATEGORIES (TOOLBOX_CAT_I - TOOLBOX_CAT_A + 1) +#define NUM_TBX_CATEGORIES (TOOLBOX_CAT_I - TOOLBOX_CAT_A + 1) #endif - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - ooo_custom_images/classic
ooo_custom_images/classic/classic_images.tar.gz |binary 1 file changed New commits: commit 2e5661ecbdb849ef896d1deca14f70e7b713a186 Author: Matthias Seidel AuthorDate: Sat Jul 6 16:02:14 2019 + Commit: Matthias Seidel CommitDate: Sat Jul 6 16:02:14 2019 + Added new Math elements to classic icon set diff --git a/ooo_custom_images/classic/classic_images.tar.gz b/ooo_custom_images/classic/classic_images.tar.gz index eeef4d9efc3e..dcdd99b77138 100644 Binary files a/ooo_custom_images/classic/classic_images.tar.gz and b/ooo_custom_images/classic/classic_images.tar.gz differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - dbaccess/source
dbaccess/source/ui/dlg/dlgsize.src | 95 -
1 file changed, 33 insertions(+), 62 deletions(-)
New commits:
commit 617d167935abaadddbeb64c4ba64e379883da3de
Author: Matthias Seidel
AuthorDate: Sat Jul 6 13:49:06 2019 +
Commit: Matthias Seidel
CommitDate: Sat Jul 6 13:49:06 2019 +
Cleaned up whitespace
diff --git a/dbaccess/source/ui/dlg/dlgsize.src
b/dbaccess/source/ui/dlg/dlgsize.src
index 1e7d2eb9d478..cf8b6ef5b688 100644
--- a/dbaccess/source/ui/dlg/dlgsize.src
+++ b/dbaccess/source/ui/dlg/dlgsize.src
@@ -36,21 +36,21 @@ ModalDialog DLG_ROWHEIGHT
OutputSize = TRUE ;
SVLook = TRUE ;
HelpId = HID_DLG_ROWHEIGHT ;
-Size = MAP_APPFONT ( 159 , 59 ) ;
+Size = MAP_APPFONT ( 159, 59 ) ;
Moveable = TRUE ;
Closeable = TRUE ;
FixedText FT_VALUE
{
-Pos = MAP_APPFONT ( 6 , 8 ) ;
-Size = MAP_APPFONT ( 23 , 10 ) ;
+Pos = MAP_APPFONT ( 6, 8 ) ;
+Size = MAP_APPFONT ( 23, 10 ) ;
Text [ en-US ] = "~Height" ;
};
MetricField MF_VALUE
{
-HelpID = "dbaccess:MetricField:DLG_ROWHEIGHT:MF_VALUE";
+HelpID = "dbaccess:MetricField:DLG_ROWHEIGHT:MF_VALUE" ;
Border = TRUE ;
-Pos = MAP_APPFONT ( 36 , 6 ) ;
-Size = MAP_APPFONT ( 63 , 12 ) ;
+Pos = MAP_APPFONT ( 36, 6 ) ;
+Size = MAP_APPFONT ( 63, 12 ) ;
TabStop = TRUE ;
Spin = TRUE ;
Minimum = 10 ;
@@ -61,29 +61,29 @@ ModalDialog DLG_ROWHEIGHT
};
CheckBox CB_STANDARD
{
-HelpID = "dbaccess:CheckBox:DLG_ROWHEIGHT:CB_STANDARD";
-Pos = MAP_APPFONT ( 36 , 25 ) ;
-Size = MAP_APPFONT ( 62 , 12 ) ;
+HelpID = "dbaccess:CheckBox:DLG_ROWHEIGHT:CB_STANDARD" ;
+Pos = MAP_APPFONT ( 36, 25 ) ;
+Size = MAP_APPFONT ( 62, 12 ) ;
TabStop = TRUE ;
-Text [ en-US ] = "~Automatic";
+Text [ en-US ] = "~Automatic" ;
};
OKButton PB_OK
{
-Pos = MAP_APPFONT ( 105 , 6 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 105, 6 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton PB_CANCEL
{
-Pos = MAP_APPFONT ( 105 , 23 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 105, 23 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
HelpButton PB_HELP
{
-Pos = MAP_APPFONT ( 105 , 42 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 105, 42 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
Text [ en-US ] = "Row Height" ;
@@ -93,21 +93,21 @@ ModalDialog DLG_COLWIDTH
OutputSize = TRUE ;
SVLook = TRUE ;
HelpId = HID_DLG_COLWIDTH ;
-Size = MAP_APPFONT ( 159 , 59 ) ;
+Size = MAP_APPFONT ( 159, 59 ) ;
Moveable = TRUE ;
Closeable = TRUE ;
FixedText FT_VALUE
{
-Pos = MAP_APPFONT ( 6 , 8 ) ;
-Size = MAP_APPFONT ( 23 , 10 ) ;
+Pos = MAP_APPFONT ( 6, 8 ) ;
+Size = MAP_APPFONT ( 23, 10 ) ;
Text [ en-US ] = "~Width" ;
};
MetricField MF_VALUE
{
-HelpID = "dbaccess:MetricField:DLG_COLWIDTH:MF_VALUE";
+HelpID = "dbaccess:MetricField:DLG_COLWIDTH:MF_VALUE" ;
Border = TRUE ;
-Pos = MAP_APPFONT ( 36 , 6 ) ;
-Size = MAP_APPFONT ( 63 , 12 ) ;
+Pos = MAP_APPFONT ( 36, 6 ) ;
+Size = MAP_APPFONT ( 63, 12 ) ;
TabStop = TRUE ;
Spin = TRUE ;
Minimum = 10 ;
@@ -118,61 +118,32 @@ ModalDialog DLG_COLWIDTH
};
CheckBox CB_STANDARD
{
-HelpID = "dbaccess:CheckBox:DLG_COLWIDTH:CB_STANDARD";
-Pos = MAP_APPFONT ( 36 , 25 ) ;
-Size = MAP_APPFONT ( 62 , 12 ) ;
+HelpID = "dbaccess:CheckBox:DLG_COLWIDTH:CB_STANDARD" ;
+Pos = MAP_APPFONT ( 36, 25 ) ;
+Size = MAP_APPFONT ( 62, 12 ) ;
TabStop = TRUE ;
-Text [ en-US ] = "~Automatic";
+Text [ en-US ] = "~Automatic" ;
};
OKButton PB_OK
{
-Pos = MAP_APPFONT ( 105 , 6 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 105, 6 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton PB_CANCEL
{
-Pos = MAP_APPFONT ( 105 , 23 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 105, 23 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
HelpButton PB_HELP
{
-Pos = MAP_APPFONT ( 105 , 42 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source
svx/source/dialog/language.src | 35 ---
1 file changed, 4 insertions(+), 31 deletions(-)
New commits:
commit c87a1824a7cebdd5ae680eb0260e18afb45690d1
Author: Matthias Seidel
AuthorDate: Sat Jun 29 08:24:46 2019 +
Commit: Matthias Seidel
CommitDate: Sat Jun 29 08:24:46 2019 +
Cleaned up whitespace
diff --git a/svx/source/dialog/language.src b/svx/source/dialog/language.src
index d10b6a81f097..b730ea952411 100644
--- a/svx/source/dialog/language.src
+++ b/svx/source/dialog/language.src
@@ -21,42 +21,15 @@
- // include ---
+// include ---
#include
- // pragma
+// pragma
- // Language-Strings --
+// Language-Strings --
String RID_SVXSTR_LANGUAGE_ALL
{
Text [ en-US ] = "[All]" ;
};
- // ** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ** EOF
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/starmath starmath/source
default_images/starmath/res/un21222.png |binary
default_images/starmath/res/un21223.png |binary
default_images/starmath/res/unh21222.png |binary
default_images/starmath/res/unh21223.png |binary
starmath/source/toolbox.src | 379 ---
5 files changed, 197 insertions(+), 182 deletions(-)
New commits:
commit a442dd9ad650f9939ec9b1c07093f38656d7fea9
Author: Matthias Seidel
AuthorDate: Thu Jun 27 16:37:51 2019 +
Commit: Matthias Seidel
CommitDate: Thu Jun 27 16:37:51 2019 +
Added two elements to Math toolbox, cleaned up whitespace
diff --git a/default_images/starmath/res/un21222.png
b/default_images/starmath/res/un21222.png
new file mode 100644
index ..d7a262c62d1f
Binary files /dev/null and b/default_images/starmath/res/un21222.png differ
diff --git a/default_images/starmath/res/un21223.png
b/default_images/starmath/res/un21223.png
new file mode 100644
index ..557a5b7bc9ce
Binary files /dev/null and b/default_images/starmath/res/un21223.png differ
diff --git a/default_images/starmath/res/unh21222.png
b/default_images/starmath/res/unh21222.png
new file mode 100644
index ..bdea3b34f0c8
Binary files /dev/null and b/default_images/starmath/res/unh21222.png differ
diff --git a/default_images/starmath/res/unh21223.png
b/default_images/starmath/res/unh21223.png
new file mode 100644
index ..f569dc994553
Binary files /dev/null and b/default_images/starmath/res/unh21223.png differ
diff --git a/starmath/source/toolbox.src b/starmath/source/toolbox.src
index 3501766f5f01..8ffa2eb70684 100755
--- a/starmath/source/toolbox.src
+++ b/starmath/source/toolbox.src
@@ -21,7 +21,6 @@
-
#include
#include
#include "starmath.hrc"
@@ -40,15 +39,15 @@ FloatingWindow RID_TOOLBOXWINDOW
Hide = TRUE ;
OutputSize = TRUE ;
SVLook = TRUE ;
-Size = MAP_APPFONT ( 0 , 0 ) ; // to be calculated programmatically
+Size = MAP_APPFONT ( 0, 0 ) ; // to be calculated programmatically
Text [ en-US ] = "Elements" ;
ToolBox TOOLBOX_CATALOG
{
// main menu of selection-window
HelpId = HID_SMA_SELECTION_TBX ;
-Pos = MAP_APPFONT ( 0 , 0 ) ;
-Size = MAP_APPFONT ( 65 , 38 ) ;
+Pos = MAP_APPFONT ( 0, 0 ) ;
+Size = MAP_APPFONT ( 65, 38 ) ;
SVLook = TRUE ;
LineCount = 2 ;
ItemList =
@@ -97,7 +96,7 @@ FloatingWindow RID_TOOLBOXWINDOW
{
Identifier = RID_MISC_CAT ;
HelpId = HID_SMA_MISC_CAT ;
-Text [ en-US ] = "Others";
+Text [ en-US ] = "Others" ;
};
ToolBoxItem
{
@@ -120,19 +119,19 @@ FloatingWindow RID_TOOLBOXWINDOW
FixedLine FL_TOOLBOX_CAT_DELIM
{
-Pos = MAP_APPFONT ( 0 , 44 ) ;
-Size = MAP_APPFONT ( 65 , 8 ) ;
+Pos = MAP_APPFONT ( 0, 44 ) ;
+Size = MAP_APPFONT ( 65, 8 ) ;
};
ToolBox TOOLBOX_CAT_A
{
// unary/binary operators
HelpId = HID_SMA_UNBINOPS_TBX ;
-Pos = MAP_APPFONT ( 0 , 45 ) ;
-Size = MAP_APPFONT ( 65 , 95 ) ;
+Pos = MAP_APPFONT ( 0, 45 ) ;
+Size = MAP_APPFONT ( 65, 95 ) ;
SVLook = TRUE ;
Hide = TRUE ;
-LineCount = 4 ;
+LineCount = 5 ;
ItemList =
{
@@ -242,7 +241,23 @@ FloatingWindow RID_TOOLBOXWINDOW
{
Identifier = RID_XCIRCY ;
HelpId = HID_SMA_XCIRCY ;
-Text [ en-US ] = "Concatenate";
+Text [ en-US ] = "Concatenate" ;
+};
+ToolBoxItem
+{
+Type = TOOLBOXITEM_BREAK ;
+};
+ToolBoxItem
+{
+Identifier = RID_XWIDESLASHY ;
+HelpId = HID_SMA_XWIDESLASHY ;
+Text [ en-US ] = "Wide Slash" ;
+};
+ToolBoxItem
+{
+Identifier = RID_XWIDEBSLASHY ;
+HelpId = HID_SMA_XWIDEBSLASHY ;
+Text [ en-US ] = "Wide Backslash" ;
};
};
};
@@ -251,8 +266,8 @@ FloatingWindow RID_TOOLBOXWINDOW
{
// relations
HelpId = HID_SMA_RELATIONS_TBX ;
-Pos = MAP_APPFONT ( 0 , 45 ) ;
-Size = MAP_APPFONT ( 65 , 95 ) ;
+Pos = MAP_APPFONT ( 0, 45 ) ;
+Size = MAP_APPFONT ( 65, 95 ) ;
SVLook = TRUE ;
Hide = TRUE ;
LineCount = 5 ;
@@ -280,13 +295,13 @@ FloatingWindow RID_TOOLBOXWINDOW
{
Identifier = RID_XDIVIDESY ;
HelpId = HID_SMA_XDIVIDESY ;
-Text [ en-US ] = "Divides";
+Text [ en-US ] = "Divides" ;
};
ToolBoxItem
{
Identifier = RID
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions.lst
extensions.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 61b272ae0a34d9ca1e6cef78ee5c5250ec4049ff Author: Matthias Seidel AuthorDate: Thu Jun 27 08:16:58 2019 + Commit: Matthias Seidel CommitDate: Thu Jun 27 08:16:58 2019 + Updated English dictionary 2019.07.01 diff --git a/extensions.lst b/extensions.lst index 5655e3cea1e5..911ad5a9d833 100644 --- a/extensions.lst +++ b/extensions.lst @@ -73,7 +73,7 @@ # English (en_AU, en_CA, en_GB, en_US, en_ZA) dictionary [ language=en.* || language=de || language=it ] - 2d8cc9e3825d481283bf6f3817ac4b4e https://sourceforge.net/projects/aoo-extensions/files/17102/47/dict-en-20190501b.oxt/download "dict-en.oxt" + bcd0e2c98617b139f0b4e74ef5ae46e1 https://sourceforge.net/projects/aoo-extensions/files/17102/48/dict-en-20190701.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/inc svtools/source
solenv/inc/langlist.mk |1 +
svtools/source/misc/langtab.src |4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit b4e6c3ad1bec0044ea7bf8efc1b0654d25706f86
Author: Matthias Seidel
AuthorDate: Sun Jun 23 23:01:09 2019 +
Commit: Matthias Seidel
CommitDate: Sun Jun 23 23:01:09 2019 +
Added Amharic (am) to language list
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index c3281f285ec1..2a6eee6ca7ec 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -22,6 +22,7 @@
completelangiso=af \
+am \
ar \
as \
as-IN \
commit f121c536505d13447c069a2fa3b2c7e968098711
Author: Matthias Seidel
AuthorDate: Sun Jun 23 19:34:06 2019 +
Commit: Matthias Seidel
CommitDate: Sun Jun 23 19:34:06 2019 +
Cleaned up whitespace
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index ddc6be324cdc..97e116c70ec4 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -21,7 +21,7 @@
- // include ---
+// include ---
#include
#define RSC_RESOURCE_USAGE 1
@@ -29,7 +29,7 @@
#define PairedList ItemList
- // STR_ARR_SVT_LANGUAGE_TABLE
+// STR_ARR_SVT_LANGUAGE_TABLE
StringArray STR_ARR_SVT_LANGUAGE_TABLE
{
PairedList [ en-US ] =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin
solenv/bin/modules/installer/globals.pm | 24
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 573971b607a886886631d102f08f81db0f7a1938
Author: Matthias Seidel
AuthorDate: Fri Jun 21 15:21:44 2019 +
Commit: Matthias Seidel
CommitDate: Fri Jun 21 15:21:44 2019 +
Cleaned up whitespace
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index cd9826a4367b..8202dbc3d536 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -171,8 +171,8 @@ BEGIN
$programmenufolder = "ProgramMenuFolder";
$systemfolder = "SystemFolder";
$encodinglistname = "msi-encodinglist.txt";
-$msiencoding = ""; # hash reference for msi encodings
-$msilanguage = ""; # hash reference for msi languages LCID
+$msiencoding = ""; # hash reference for msi encodings
+$msilanguage = ""; # hash reference for msi languages LCID
$sofficeiconadded = 0;
$temppath = "";
$globaltempdirname = "ooopackaging";
@@ -236,7 +236,7 @@ BEGIN
$strip = 1;
$globallogging = 0;
-$logfilename = "logfile.log"; # the default logfile name for global
errors
+$logfilename = "logfile.log"; # the default logfile name for global errors
# @logfileinfo = ();
# @errorlogfileinfo = ();
# @globallogfileinfo = ();
@@ -297,7 +297,7 @@ BEGIN
$productxpdfile = "setup.xpd";
$xpd_files_prepared = 0;
$defaultlanguage = "";
-# @emptyxpdparents = ();
+# @emptyxpdparents = ();
@createdxpdfiles = ();
@allxpdfiles = ();
$isxpdplatform = 0;
@@ -407,7 +407,7 @@ BEGIN
$fix_number_of_cab_files = 1;
$cabfilecompressionlevel = 2;
-$number_of_cabfiles = 1;# only for $fix_number_of_cab_files = 1
+$number_of_cabfiles = 1; # only for $fix_number_of_cab_files = 1
$include_cab_in_msi = 0;
$msidatabasename = "";
$prepare_winpatch = 0;
@@ -418,9 +418,9 @@ BEGIN
%newfilescollector = ();
$saveinstalldir = "";
-$csp_installdir = ""; # global installdir of createsimplepackage()
in simplepackage.pm
-$csp_installlogdir = "";# global installlogdir of
createsimplepackage() in simplepackage.pm
-$csp_languagestring = ""; # global languagestring of
createsimplepackage() in simplepackage.pm
+$csp_installdir = ""; # global installdir of createsimplepackage() in
simplepackage.pm
+$csp_installlogdir = ""; # global installlogdir of createsimplepackage()
in simplepackage.pm
+$csp_languagestring = ""; # global languagestring of createsimplepackage()
in simplepackage.pm
$localunpackdir = "";
$localinstalldirset = 0;
$localinstalldir = "";
@@ -478,7 +478,7 @@ BEGIN
if ( $plat =~ /cygwin/i )
{
-$zippath = "zip"; # Has to be in the path:
/usr/bin/zip
+$zippath = "zip"; # Has to be in the path: /usr/bin/zip
$checksumfile = "so_checksum";
$unopkgfile = "unopkg.exe";
$separator = "/";
@@ -491,7 +491,7 @@ BEGIN
elsif ( $plat =~ /os2/i )
{
print "Setup OS/2 platform\n";
-$zippath = "zip"; # Has to be in the path:
/usr/bin/zip
+$zippath = "zip"; # Has to be in the path: /usr/bin/zip
$checksumfile = "so_checksum";
$unopkgfile = "unopkg.bin";
$separator = "/";
@@ -504,7 +504,7 @@ BEGIN
}
else
{
-$zippath = "zip"; # Has to be in the path:
/usr/bin/zip
+$zippath = "zip"; # Has to be in the path: /usr/bin/zip
$checksumfile = "so_checksum";
$unopkgfile = "unopkg";
$separator = "/";
@@ -533,7 +533,7 @@ BEGIN
# ToDo: Needs to be expanded for additional platforms
-$is_release = 0; # Is changed in parameter.pm when the -release option is
given.
+$is_release = 0; # Is changed in parameter.pm when the -release option is
given.
$source_version = undef;
$target_version = undef;
$source_msi = undef;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - dbaccess/source setup_native/source
dbaccess/source/ui/dlg/AutoControls_tmpl.hrc |3 +-- setup_native/source/win32/msi-encodinglist.txt |3 --- 2 files changed, 1 insertion(+), 5 deletions(-) New commits: commit cffc33706f6eb1d85f6da8600a98f4ef9f5c43a8 Author: Matthias Seidel AuthorDate: Wed Jun 19 23:54:32 2019 + Commit: Matthias Seidel CommitDate: Wed Jun 19 23:54:32 2019 + Removed some whitespace, changed String diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc index e8ac2e31746e..5380419ac6d9 100644 --- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc +++ b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc @@ -21,7 +21,6 @@ - #ifndef _DBAUI_AUTOCONTROLS_HRC_ #define _DBAUI_AUTOCONTROLS_HRC_ @@ -92,7 +91,7 @@ Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \ HelpId = AUTO_HID2; \ TabStop = TRUE ; \ - Text[ en-US ] = "Browse"; \ + Text[ en-US ] = "Browse..."; \ }; // -- commit 1ef42d9e4d96b2010ff569eb51a2207c0e755e1d Author: Matthias Seidel AuthorDate: Wed Jun 19 23:23:20 2019 + Commit: Matthias Seidel CommitDate: Wed Jun 19 23:23:20 2019 + Removed empty lines introduced in my last commit. diff --git a/setup_native/source/win32/msi-encodinglist.txt b/setup_native/source/win32/msi-encodinglist.txt index 687a133d76cc..f78899d12a03 100644 --- a/setup_native/source/win32/msi-encodinglist.txt +++ b/setup_native/source/win32/msi-encodinglist.txt @@ -18,9 +18,6 @@ # under the License. # # * - - - # Syntax: language ANSI-Codepage LCID # comment lines begin with hash af1252 1078 # Afrikaans ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - offapi/com
offapi/com/sun/star/drawing/DrawingDocumentFactory.idl |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 0ce5cac0e492900c392fd46229d3c9ae54c4587c
Author: Matthias Seidel
AuthorDate: Wed Jun 19 20:27:31 2019 +
Commit: Matthias Seidel
CommitDate: Wed Jun 19 20:27:31 2019 +
Fixed typos, removed whitespace
diff --git a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
index 31d1456e91f5..97106df1f3bb 100644
--- a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
@@ -21,7 +21,7 @@
#ifndef __com_sun_star_drawing_DrawingDocumentFactory_idl__
-#define __com::sun::star::drawing_DrawingDocumentFactory_idl__
+#define __com_sun_star_drawing_DrawingDocumentFactory_idl__
#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include
@@ -29,11 +29,11 @@
//=
- module com { module sun { module star { module drawing {
+ module com { module sun { module star { module drawing {
//=
-/** @deprecated Pleas use the factory interface of the service
GenericDrawingDocument.
+/** @deprecated Please use the factory interface of the service
GenericDrawingDocument.
*/
published service DrawingDocumentFactory
{
@@ -46,4 +46,3 @@ published service DrawingDocumentFactory
}; }; }; };
#endif
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - dbaccess/AllLangResTarget_dbui.mk solenv/gbuild
dbaccess/AllLangResTarget_dbui.mk |4 ++-- solenv/gbuild/AllLangResTarget.mk |6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 0f8a7c476a085501364649b52ae8f1ebf757a5cf Author: Matthias Seidel AuthorDate: Tue Jun 18 10:50:07 2019 + Commit: Matthias Seidel CommitDate: Tue Jun 18 10:50:07 2019 + i128128 - Lost translations in database wizard Fixing double slash and wrong paths diff --git a/dbaccess/AllLangResTarget_dbui.mk b/dbaccess/AllLangResTarget_dbui.mk index 829af504a246..6f6ef48e9055 100644 --- a/dbaccess/AllLangResTarget_dbui.mk +++ b/dbaccess/AllLangResTarget_dbui.mk @@ -126,7 +126,7 @@ $(WORKDIR)/inc/dbaccess/AutoControls.hrc : $(SRCDIR)/dbaccess/source/ui/dlg/Auto $(call gb_Helper_abbreviate_dirs_native, \ $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ -p svx \ --i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/inc/localize.sdf -l all) +-i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/source/ui/dlg/localize.sdf -l all) $(WORKDIR)/inc/dbaccess/toolbox.hrc : $(SRCDIR)/dbaccess/source/ui/inc/toolbox_tmpl.hrc $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf echo merging $@ @@ -136,7 +136,7 @@ $(WORKDIR)/inc/dbaccess/toolbox.hrc : $(SRCDIR)/dbaccess/source/ui/inc/toolbox_t $(call gb_Helper_abbreviate_dirs_native, \ $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ -p svx \ --i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/inc/localize.sdf -l all) +-i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/source/ui/inc/localize.sdf -l all) endif diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 073fc981be78..8aa245bf66c9 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -27,7 +27,7 @@ gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target,transex3) # gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) $(gb_SrsPartMergeTarget_TRANSEXTARGET) -gb_SrsPartMergeTarget_SDFLOCATION := $(LOCDIR)/l10n/$(INPATH)/misc/sdf/ +gb_SrsPartMergeTarget_SDFLOCATION := $(LOCDIR)/l10n/$(INPATH)/misc/sdf gb_SrsPartMergeTarget_REPOS := $(gb_REPOS) define gb_SrsPartMergeTarget__command @@ -102,8 +102,8 @@ $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := else $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call gb_SrsPartMergeTarget_get_target,$(1)) $(call gb_SrsPartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_get_target,$(1)) -$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf) -$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf) +$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)/$(dir $(1))localize.sdf) +$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)/$(dir $(1))localize.sdf) endif endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - i18npool/inc i18npool/source
i18npool/inc/i18npool/lang.h|1 +
i18npool/source/isolang/isolang.cxx |9 +
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 76c28ecc9c1faa4407dd02101aee57405b76d9d4
Author: Matthias Seidel
AuthorDate: Tue Jun 18 09:09:30 2019 +
Commit: Matthias Seidel
CommitDate: Tue Jun 18 09:09:30 2019 +
Additions for new language Amharic (am)
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index c06de7b9e030..074de5325bf1 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -110,6 +110,7 @@ typedef unsigned short LanguageType;
#define LANGUAGE_AFRIKAANS 0x0436
#define LANGUAGE_ALBANIAN 0x041C
#define LANGUAGE_ALSATIAN_FRANCE0x0484
+#define LANGUAGE_AMHARIC0x005E
#define LANGUAGE_AMHARIC_ETHIOPIA 0x045E
#define LANGUAGE_ARABIC_ALGERIA 0x1401
#define LANGUAGE_ARABIC_BAHRAIN 0x3C01
diff --git a/i18npool/source/isolang/isolang.cxx
b/i18npool/source/isolang/isolang.cxx
index 250935130ffd..2cef0e44e5e5 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -86,10 +86,10 @@ struct IsoLangOtherEntry
// language, see code. A call with "en-ZZ" (not in table) would still result in
// LANGUAGE_ENGLISH.
-/* erAck: 2007-07-05T20:01+0200 TODO: The entire suite's "primary language
+/* erAck: 2007-07-05T20:01+0200 TODO: The entire suite's "primary language
* only" usage and locale fall back should be cleaned up and made consistent. I
* strongly doubt that most callers exactly expect the behavior described.
- * Currently these primary LangIDs are used literally in OOo code:
+ * Currently these primary LangIDs are used literally in AOO code:
* LANGUAGE_ENGLISH LANGUAGE_CHINESE LANGUAGE_MALAY
* LANGUAGE_AZERI LANGUAGE_URDU LANGUAGE_KASHMIRI
*/
@@ -335,6 +335,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
{ LANGUAGE_UIGHUR_CHINA,"ug", "CN" },
{ LANGUAGE_TIGRIGNA_ETHIOPIA, "ti", "ET" },
{ LANGUAGE_TIGRIGNA_ERITREA,"ti", "ER" },
+{ LANGUAGE_AMHARIC, "am", "" },
{ LANGUAGE_AMHARIC_ETHIOPIA,"am", "ET" },
{ LANGUAGE_GUARANI_PARAGUAY, "gug", "PY" },
{ LANGUAGE_HAWAIIAN_UNITED_STATES, "haw", "US" },
@@ -933,8 +934,8 @@ LanguageType MsLangId::convertIsoNamesToLanguage( const
rtl::OUString& rLang,
if ( pFirstLang )
return pFirstLang->mnLang;
-// if only the country is set, look for any entry matching the country
-// (to allow reading country and language in separate steps, in any order)
+// if only the country is set, look for any entry matching the country
+// (to allow reading country and language in separate steps, in any order)
if ( rCountry.getLength() && !rLang.getLength() )
{
const IsoLangEntry* pEntry2 = aImplIsoLangEntries;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scp2/source setup_native/source
scp2/source/ooo/module_langpack.ulf| 16 +++--- setup_native/source/win32/msi-encodinglist.txt | 37 + 2 files changed, 31 insertions(+), 22 deletions(-) New commits: commit 671db054c3cecb2a109f69d205d45095a94a170c Author: Matthias Seidel AuthorDate: Mon Jun 17 14:28:09 2019 + Commit: Matthias Seidel CommitDate: Mon Jun 17 14:28:09 2019 + Additions for new language Amharic (am) diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index 9750f81f6423..ab7e4bc1e959 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -1,5 +1,5 @@ /** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,20 +7,20 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - + [STR_NAME_MODULE_ROOT_LANGPACK] en-US = "Additional language packs" @@ -723,6 +723,12 @@ en-US = "Oromo" [STR_DESC_MODULE_LANGPACK_OM] en-US = "Installs Oromo support in %PRODUCTNAME %PRODUCTVERSION" +[STR_NAME_MODULE_LANGPACK_AM] +en-US = "Amharic" + +[STR_DESC_MODULE_LANGPACK_AM] +en-US = "Installs Amharic support in %PRODUCTNAME %PRODUCTVERSION" + [STR_NAME_MODULE_LANGPACK_AST] en-US = "Asturian" diff --git a/setup_native/source/win32/msi-encodinglist.txt b/setup_native/source/win32/msi-encodinglist.txt index 60246050e99e..687a133d76cc 100644 --- a/setup_native/source/win32/msi-encodinglist.txt +++ b/setup_native/source/win32/msi-encodinglist.txt @@ -1,5 +1,5 @@ # * -# +# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -7,17 +7,20 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# #http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -# +# # * + + + # Syntax: language ANSI-Codepage LCID # comment lines begin with hash af1252 1078 # Afrikaans @@ -32,26 +35,26 @@ bg1251 1026 # Bulgarian bn 0 2117 # Bengali bn-BD0 2117 # Bengali Bangladesh bn-IN0 1093 # Bengali India -bo 0 2121 +bo 0 2121 br1252 1150 # Breton brx 0 1603 # Bodo (India) -bs 0 5146 # bosnian +bs 0 5146 # Bosnian ca1252 1027 # Catalan -ca-XR 1252 32772 # Catalan Valencian RACV -ca-XV 1252 32771 # Catalan Valencian AVL +ca-XR 1252 32772 # Catalan Valencian RACV +ca-XV 1252 32771 # Catalan Valencian AVL cs1250 1029 # Czech cy1252 1106 # Welsh -da1252 1030 -de1252 1031 +da1252 1030 # Danish +de1252 1031 # German dgo 0 1604 # Dogri (India) -dz 0 2129 # Dzongkha (same ID as tibetan bhutan (s. i40713)) +dz 0 2129 # Dzongkha (same ID as tibetan bhutan (see i40713)) el1253 1032 en-GB 1252 2057 en-US 1252 1033 en-ZA 1252 7177 eo 0 1553 # Esperanto es1252 1034 -et1257 1061 +et1257 1061 # Estonian eu1252 1069 # Basque fa 0 1065 # Farsi fi1252 1035 @@ -72,7 +75,7 @@ hu1250 1038 hy 0 1067 # Armenian id1252 1057 # Indonesian is1252 1039 # Icelandic -it1252 1040 +it1252 1040 # Italian ja 932 1041 jbo 0 1624 ka 0 1079 # Georgian @@ -82,7 +85,7 @@ kk 0 1087 km 0 1107 # Khmer kn 0 1099 # Kannada kn-IN0 1099 # Kannada -ko 949 1042 +ko 949 1042 # Korean kok 0 # Konkani ks
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - setup_native/source
setup_native/source/win32/msi-encodinglist.txt |1 + 1 file changed, 1 insertion(+) New commits: commit 7788ff5abf4ea71b61fe49de05d53f2f065bd79e Author: Matthias Seidel AuthorDate: Sun Jun 16 22:21:31 2019 + Commit: Matthias Seidel CommitDate: Sun Jun 16 22:21:31 2019 + Add new language Amharic (am) diff --git a/setup_native/source/win32/msi-encodinglist.txt b/setup_native/source/win32/msi-encodinglist.txt index ca43c79b34b8..60246050e99e 100644 --- a/setup_native/source/win32/msi-encodinglist.txt +++ b/setup_native/source/win32/msi-encodinglist.txt @@ -21,6 +21,7 @@ # Syntax: language ANSI-Codepage LCID # comment lines begin with hash af1252 1078 # Afrikaans +am 0 1118 # Amharic ar1256 1025 ar-SA 1256 1025 as 0 1101 # Assamese ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source
svx/source/dialog/langbox.src | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
New commits:
commit 2eca2d26fee7f5dcdb7ad914a1003a7ee8fe0ca0
Author: Matthias Seidel
AuthorDate: Sat Jun 15 06:28:51 2019 +
Commit: Matthias Seidel
CommitDate: Sat Jun 15 06:28:51 2019 +
Cleaned up whitespace, removed maskcolor
diff --git a/svx/source/dialog/langbox.src b/svx/source/dialog/langbox.src
index 4ae5a68c8249..f04f504d4760 100644
--- a/svx/source/dialog/langbox.src
+++ b/svx/source/dialog/langbox.src
@@ -27,19 +27,15 @@
Image RID_SVXIMG_NOTCHECKED
{
-ImageBitmap = Bitmap { File = "notcheck.bmp" ; } ;
-MaskColor = Color { Red = 0x ; Green = 0x ; Blue = 0x ; };
+ImageBitmap = Bitmap { File = "notcheck.png" ; } ;
};
Image RID_SVXIMG_CHECKED
{
-ImageBitmap = Bitmap { File = "lngcheck.bmp" ; } ;
-MaskColor = Color { Red = 0x ; Green = 0x ; Blue = 0x ; };
+ImageBitmap = Bitmap { File = "lngcheck.png" ; } ;
};
Image RID_SVXIMG_CHECKED_H
{
-ImageBitmap = Bitmap { File = "lngcheck_h.bmp" ; } ;
-MaskColor = Color { Red = 0x ; Green = 0x ; Blue = 0x ; };
+ImageBitmap = Bitmap { File = "lngcheck_h.png" ; } ;
};
// ** EOF
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - filter/source
filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl | 18 ++-- 1 file changed, 9 insertions(+), 9 deletions(-) New commits: commit 9782b15a45de5bc64a31fd61cb3385cf5dcd2deb Author: Matthias Seidel AuthorDate: Thu Jun 13 22:10:33 2019 + Commit: Matthias Seidel CommitDate: Thu Jun 13 22:10:33 2019 + Changed branding OpenOffice.org -> Apache OpenOffice, fixed typos diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl index 2e566b52605f..df04b39d94dc 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl @@ -1,6 +1,6 @@ http://www.w3.org/1999/XSL/Transform; @@ -103,7 +103,7 @@ +This URL session is used for example when links to graphics are created by XSLT. Otherwise the user has to log in again for every graphic he likes to see. --> @@ -113,12 +113,12 @@ - + - @@ -150,7 +150,7 @@ - This file was converted to xhtml by OpenOffice.org - see http://xml.openoffice.org/odf2xhtml for more info. + This file was converted to xhtml by Apache OpenOffice - see https://xml.openoffice.org/odf2xhtml for more info. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - ooo_custom_images/classic
ooo_custom_images/classic/classic_images.tar.gz |binary 1 file changed New commits: commit d722ee20b32e0352e1a927b410698f1ae728c14b Author: Matthias Seidel AuthorDate: Wed Jun 12 19:54:17 2019 + Commit: Matthias Seidel CommitDate: Wed Jun 12 19:54:17 2019 + Restored icons diff --git a/ooo_custom_images/classic/classic_images.tar.gz b/ooo_custom_images/classic/classic_images.tar.gz index c2d7f0fdc2c7..eeef4d9efc3e 100644 Binary files a/ooo_custom_images/classic/classic_images.tar.gz and b/ooo_custom_images/classic/classic_images.tar.gz differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source
cui/source/tabpages/connect.src | 138 +++-
1 file changed, 53 insertions(+), 85 deletions(-)
New commits:
commit d78e60f7b9167eb893cccee3f3206af9ffc55c0b
Author: Matthias Seidel
AuthorDate: Tue Jun 11 00:00:47 2019 +
Commit: Matthias Seidel
CommitDate: Tue Jun 11 00:00:47 2019 +
Cleaned up whitespace
diff --git a/cui/source/tabpages/connect.src b/cui/source/tabpages/connect.src
index eca67a660371..520f7d75a757 100644
--- a/cui/source/tabpages/connect.src
+++ b/cui/source/tabpages/connect.src
@@ -20,56 +20,57 @@
*/
- // pragma
- // include ---
+// pragma
+
+// include ---
#include
#include "connect.hrc"
#include
#include "helpid.hrc"
#include
- // RID_SVXPAGE_CONNECTION
+// RID_SVXPAGE_CONNECTION
TabPage RID_SVXPAGE_CONNECTION
{
HelpId = HID_PAGE_CONNECTION ;
SVLook = TRUE ;
Hide = TRUE ;
-Size = MAP_APPFONT ( 260 , 185 ) ;
+Size = MAP_APPFONT ( 260, 185 ) ;
Text [ en-US ] = "Connector" ;
FixedText FT_TYPE
{
-Pos = MAP_APPFONT ( 6 , 8 ) ;
-Size = MAP_APPFONT ( 25 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 8 ) ;
+Size = MAP_APPFONT ( 25, 8 ) ;
Text [ en-US ] = "~Type" ;
};
ListBox LB_TYPE
{
-HelpID = "cui:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE";
+HelpID = "cui:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE" ;
Border = TRUE ;
-Pos = MAP_APPFONT ( 37 , 6 ) ;
-Size = MAP_APPFONT ( 83 , 54 ) ;
+Pos = MAP_APPFONT ( 37, 6 ) ;
+Size = MAP_APPFONT ( 83, 54 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
FixedLine FL_DELTA
{
-Pos = MAP_APPFONT ( 6 , 24 ) ;
-Size = MAP_APPFONT ( 120 , RSC_CD_FIXEDLINE_HEIGHT ) ;
+Pos = MAP_APPFONT ( 6, 24 ) ;
+Size = MAP_APPFONT ( 120, RSC_CD_FIXEDLINE_HEIGHT ) ;
Text [ en-US ] = "Line skew" ;
};
FixedText FT_LINE_1
{
-Pos = MAP_APPFONT ( 12 , 37 ) ;
-Size = MAP_APPFONT ( 66 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 37 ) ;
+Size = MAP_APPFONT ( 66, 8 ) ;
Text [ en-US ] = "Line ~1" ;
};
MetricField MTR_FLD_LINE_1
{
-HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1";
+HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1" ;
Border = TRUE ;
-Pos = MAP_APPFONT ( 79 , 35 ) ;
-Size = MAP_APPFONT ( 41 , 12 ) ;
+Pos = MAP_APPFONT ( 79, 35 ) ;
+Size = MAP_APPFONT ( 41, 12 ) ;
TabStop = TRUE ;
Spin = TRUE ;
Repeat = TRUE ;
@@ -83,16 +84,16 @@ TabPage RID_SVXPAGE_CONNECTION
};
FixedText FT_LINE_2
{
-Pos = MAP_APPFONT ( 12 , 53 ) ;
-Size = MAP_APPFONT ( 66 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 53 ) ;
+Size = MAP_APPFONT ( 66, 8 ) ;
Text [ en-US ] = "Line ~2" ;
};
MetricField MTR_FLD_LINE_2
{
-HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2";
+HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2" ;
Border = TRUE ;
-Pos = MAP_APPFONT ( 79 , 51 ) ;
-Size = MAP_APPFONT ( 41 , 12 ) ;
+Pos = MAP_APPFONT ( 79, 51 ) ;
+Size = MAP_APPFONT ( 41, 12 ) ;
TabStop = TRUE ;
Spin = TRUE ;
Repeat = TRUE ;
@@ -106,16 +107,16 @@ TabPage RID_SVXPAGE_CONNECTION
};
FixedText FT_LINE_3
{
-Pos = MAP_APPFONT ( 12 , 69 ) ;
-Size = MAP_APPFONT ( 66 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 69 ) ;
+Size = MAP_APPFONT ( 66, 8 ) ;
Text [ en-US ] = "Line ~3" ;
};
MetricField MTR_FLD_LINE_3
{
-HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3";
+HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3" ;
Border = TRUE ;
-Pos = MAP_APPFONT ( 79 , 67 ) ;
-Size = MAP_APPFONT ( 41 , 12 ) ;
+Pos = MAP_APPFONT ( 79, 67 ) ;
+Size = MAP_APPFONT ( 41, 12 ) ;
TabStop = TRUE ;
Spin = TRUE ;
Repeat = TRUE ;
@@ -129,22 +130,22 @@ TabPage RID_SVXPAGE_CONNECTION
};
FixedLine FL_DISTANCE
{
-Pos = MAP_APPFONT ( 6 , 85 ) ;
-Size = MAP_APPFONT ( 120 , RSC_CD_FIXEDLINE_HEIGHT ) ;
+Pos = MAP_APPFONT ( 6, 85 ) ;
+Size = MAP_APPFONT ( 120, RSC_CD_FIXEDLINE_HE
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - odk/pack
odk/pack/copying/idl_chapter_refs.txt | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 9c1e4323cfee647069fe55432671f34332077cf1 Author: Matthias Seidel AuthorDate: Thu Jun 6 14:47:50 2019 + Commit: Matthias Seidel CommitDate: Thu Jun 6 14:47:50 2019 + Rename FieldMaster to fieldmaster See: https://svn.apache.org/repos/asf/openoffice/trunk/main/offapi/type_reference/typelibrary_history.txt diff --git a/odk/pack/copying/idl_chapter_refs.txt b/odk/pack/copying/idl_chapter_refs.txt index d4b31c7ef6d4..7806e6504438 100644 --- a/odk/pack/copying/idl_chapter_refs.txt +++ b/odk/pack/copying/idl_chapter_refs.txt @@ -3313,8 +3313,8 @@ com.sun.star.text.textfield.Bibliography com.sun.star.text.textfield.Chapter com.sun.star.text.textfield.Input com.sun.star.text.textfield.SetExpression -com.sun.star.text.FieldMaster.Database -com.sun.star.text.FieldMaster.User +com.sun.star.text.fieldmaster.Database +com.sun.star.text.fieldmaster.User com.sun.star.text.textfield.ReferencePageGet com.sun.star.text.textfield.ParagraphCount com.sun.star.text.textfield.Author @@ -3339,15 +3339,15 @@ com.sun.star.text.textfield.docinfo.Info3 com.sun.star.util.XUpdatable com.sun.star.text.TextContent com.sun.star.text.textfield.DatabaseSetNumber -com.sun.star.text.FieldMaster.SetExpression +com.sun.star.text.fieldmaster.SetExpression com.sun.star.text.textfield.ExtendedUser -com.sun.star.text.FieldMaster.DDE +com.sun.star.text.fieldmaster.DDE com.sun.star.text.textfield.docinfo.CreateAuthor com.sun.star.text.textfield.docinfo.Subject com.sun.star.text.textfield.PageNumber com.sun.star.text.textfield.TableFormula com.sun.star.text.textfield.docinfo.Keywords -com.sun.star.text.FieldMaster.Bibliography +com.sun.star.text.fieldmaster.Bibliography com.sun.star.text.textfield.GetReference com.sun.star.text.textfield.WordCount com.sun.star.text.textfield.DDE @@ -3369,7 +3369,7 @@ com.sun.star.text.textfield.docinfo.Info1 com.sun.star.text.textfield.DatabaseNextSet com.sun.star.text.textfield.docinfo.PrintDateTime TOPIC: -com.sun.star.text.FieldMaster +com.sun.star.text.fieldmaster com.sun.star.text.TextField com.sun.star.text.XTextField ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - odk/pack offapi/type_reference offapi/UnoApi_offapi.mk
odk/pack/copying/idl_chapter_refs.txt |2 - offapi/UnoApi_offapi.mk |2 - offapi/type_reference/typelibrary_history.txt | 44 +- 3 files changed, 24 insertions(+), 24 deletions(-) New commits: commit a8d5d59dbef745bf2d6cc06eaf8aa9241b4d603e Author: Matthias Seidel AuthorDate: Thu Jun 6 09:43:54 2019 + Commit: Matthias Seidel CommitDate: Thu Jun 6 09:43:54 2019 + Fixed typos diff --git a/odk/pack/copying/idl_chapter_refs.txt b/odk/pack/copying/idl_chapter_refs.txt index 4f63f05406ba..d4b31c7ef6d4 100644 --- a/odk/pack/copying/idl_chapter_refs.txt +++ b/odk/pack/copying/idl_chapter_refs.txt @@ -417,7 +417,7 @@ DESCR:Text - Indexes and Index Marks - Indexes REF: com.sun.star.text.BibliographyDataType com.sun.star.text.BibliographyDataField -com.sun.star.text.IllustrationIndex +com.sun.star.text.IllustrationsIndex com.sun.star.beans.XPropertySet com.sun.star.container.XIndexReplace com.sun.star.text.Bibliography diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 1e491bd64175..1a909007ea04 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -8,7 +8,7 @@ # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +#http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an diff --git a/offapi/type_reference/typelibrary_history.txt b/offapi/type_reference/typelibrary_history.txt index 2c7bf7ee0770..e73db3ecd3ba 100644 --- a/offapi/type_reference/typelibrary_history.txt +++ b/offapi/type_reference/typelibrary_history.txt @@ -1,5 +1,5 @@ #** -# +# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -7,16 +7,16 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# #http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -# +# #** 07/07/2004 (SB): BugID=i29741 @@ -45,8 +45,8 @@ the cli interfaces from type library. 11/19/2004 (JSC/TL): BugID=i36687 - adjust ChainedTextFrame service. Remove XChainable interface and insert propeties. - Interface was never implmented and the functionality was supported by properties. + adjust ChainedTextFrame service. Remove XChainable interface and insert properties. + Interface was never implemented and the functionality was supported by properties. 01/20/2005 (JSC): BugID=i40985 change const value com.sun.star.configuration.backend.NodeAttribute:MASK to @@ -83,9 +83,9 @@ directory. We need only one reference per source stand. I have also removed the types_doc.rdb because all type info is already in the normal types.rdb, even the service nad singleton type info. - In the same step i have updated the reference type library with the rdb of + In the same step I have updated the reference type library with the rdb of OOo2.0.1 and have patched the following singleton types to ensure that we need - only one type ibrary: + only one type library: - com.sun.star.script.browse.theBrowseNodeFactory - com.sun.star.script.provider.theMasterScriptProviderFactory - com.sun.star.util.theMacroExpander @@ -108,7 +108,7 @@ 05/15/06 (JSC, TL): TaskID=i54823,i62825 adapt the documentation because of specification errors which have never matched - the existing implmentation. + the existing implementation. Style -> FollowStyle property is now of type string instead of boolean TextTableRow -> TableColumnSeparators is now a sequence instead of the single return @@ -131,7 +131,7 @@ new reference type library is taken from the release source tree OOD680m5. 04/03/07 (JSC): TaskID=i76046 - update reference type library with the rleased version of OO0.2.2.0. The new + update reference type library with the released version of OO0.2.2.0. The new reference type library is taken from the release source tree OOF680 m14. 06/13/07 (MBA): TaskID=i26672 @@ -139,29 +139,29 @@ never documented properties. 09/26/07 (JSC): TaskID=i80473 - update reference type library with the rleased version of OO.org 2.3. The
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - odk/pack
odk/pack/copying/idl_chapter_refs.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 856d28801b59d45cf4d32602adc57a08cd618b6d Author: Matthias Seidel AuthorDate: Wed Jun 5 23:15:55 2019 + Commit: Matthias Seidel CommitDate: Wed Jun 5 23:15:55 2019 + Fixed "OfficeDocument" diff --git a/odk/pack/copying/idl_chapter_refs.txt b/odk/pack/copying/idl_chapter_refs.txt index 4095601a41d7..4f63f05406ba 100644 --- a/odk/pack/copying/idl_chapter_refs.txt +++ b/odk/pack/copying/idl_chapter_refs.txt @@ -3126,7 +3126,7 @@ com.sun.star.frame.Controller com.sun.star.lang.XMultiServiceFactory com.sun.star.frame.XDesktop com.sun.star.frame.Frame -com.sun.star.model.OfficeDocument +com.sun.star.document.OfficeDocument TOPIC: LINK:Documentation/DevGuide/GUI/Dialog_Controls ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - offapi/UnoApi_offapi.mk
offapi/UnoApi_offapi.mk | 7443 1 file changed, 3722 insertions(+), 3721 deletions(-) New commits: commit 536f6a7666895cc8e3ba375651cd2a8f3f1969cd Author: Matthias Seidel AuthorDate: Wed Jun 5 20:19:22 2019 + Commit: Matthias Seidel CommitDate: Wed Jun 5 20:19:22 2019 + Cleaned up whitespace, added "GlobalEventBroadcaster" diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index e111c5bb3ba1..1e491bd64175 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -1,5 +1,5 @@ ### -# +# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -7,16 +7,16 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# -#http://www.apache.org/licenses/LICENSE-2.0 -# +# +# http://www.apache.org/licenses/LICENSE-2.0 +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -# +# ### @@ -24,7 +24,7 @@ $(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi)) $(eval $(call gb_UnoApiTarget_add_rdbfiles,offapi,\ -udkapi \ + udkapi \ )) $(eval $(call gb_UnoApiTarget_set_include,offapi,\ @@ -34,3727 +34,3728 @@ $(eval $(call gb_UnoApiTarget_set_include,offapi,\ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,\ -offapi/com/sun/star/animations/TargetPropertiesCreator \ -offapi/com/sun/star/awt/AsyncCallback \ -offapi/com/sun/star/awt/ContainerWindowProvider \ -offapi/com/sun/star/awt/DialogProvider \ -offapi/com/sun/star/awt/DialogProvider2 \ -offapi/com/sun/star/awt/PrinterServer \ -offapi/com/sun/star/awt/UnoControlDialogModelProvider \ -offapi/com/sun/star/awt/grid/DefaultGridDataModel \ -offapi/com/sun/star/awt/grid/SortableGridDataModel \ -offapi/com/sun/star/awt/tree/MutableTreeDataModel \ -offapi/com/sun/star/awt/tree/MutableTreeNode \ -offapi/com/sun/star/awt/tree/TreeControl \ -offapi/com/sun/star/chart2/data/DatabaseDataProvider \ -offapi/com/sun/star/configuration/Update \ -offapi/com/sun/star/deployment/ExtensionManager \ -offapi/com/sun/star/deployment/PackageInformationProvider \ -offapi/com/sun/star/deployment/PackageRegistryBackend \ -offapi/com/sun/star/deployment/UpdateInformationProvider \ -offapi/com/sun/star/deployment/test/SmoketestCommandEnvironment \ -offapi/com/sun/star/deployment/thePackageManagerFactory \ -offapi/com/sun/star/deployment/ui/LicenseDialog \ -offapi/com/sun/star/deployment/ui/PackageManagerDialog \ -offapi/com/sun/star/deployment/ui/UpdateRequiredDialog \ -offapi/com/sun/star/document/DocumentProperties \ -offapi/com/sun/star/document/DocumentRevisionListPersistence \ -offapi/com/sun/star/drawing/SlideRenderer \ -offapi/com/sun/star/drawing/SlideSorter \ -offapi/com/sun/star/drawing/framework/BasicPaneFactory \ -offapi/com/sun/star/drawing/framework/BasicToolBarFactory \ -offapi/com/sun/star/drawing/framework/BasicViewFactory \ -offapi/com/sun/star/drawing/framework/Configuration \ -offapi/com/sun/star/drawing/framework/ConfigurationController \ -offapi/com/sun/star/drawing/framework/ModuleController \ -offapi/com/sun/star/drawing/framework/ResourceId \ -offapi/com/sun/star/embed/DocumentCloser \ -offapi/com/sun/star/embed/InstanceLocker \ -offapi/com/sun/star/embed/OLESimpleStorage \ -offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel \ -offapi/com/sun/star/form/runtime/FormOperations \ -offapi/com/sun/star/frame/PopupMenuControllerFactory \ -offapi/com/sun/star/frame/StatusbarControllerFactory \ -offapi/com/sun/star/frame/ToolbarControllerFactory \ -offapi/com/sun/star/graphic/GraphicObject \ -offapi/com/sun/star/inspection/DefaultHelpProvider \ -offapi/com/sun/star/inspection/GenericPropertyHandler \ -offapi/com/sun/star/inspection/ObjectInspector \ -offapi/com/sun/star/inspection/ObjectInspectorModel \ -offapi/com/sun/star/inspection/StringRepresentation \ -offapi/com/sun/star/linguistic2/Proofreader \ -offapi/com/sun/star/linguistic2/ProofreadingIterator \ -offapi/com/sun/star/logging/ConsoleHandler \ -offapi/com/sun/star/logging/CsvLogFormatter \ -offapi/com/sun/star/logging/DocumentIOLogRing \ -offapi/com/sun/star/logging/Fil
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - offapi/com
offapi/com/sun/star/text/BaseIndex.idl | 11 ---
offapi/com/sun/star/text/IllustrationsIndex.idl | 11 +--
2 files changed, 9 insertions(+), 13 deletions(-)
New commits:
commit 16c5d819648f7c2fba03cc386fbc5568499ac714
Author: Matthias Seidel
AuthorDate: Wed Jun 5 19:34:30 2019 +
Commit: Matthias Seidel
CommitDate: Wed Jun 5 19:34:30 2019 +
Fixed typos
diff --git a/offapi/com/sun/star/text/BaseIndex.idl
b/offapi/com/sun/star/text/BaseIndex.idl
index 74afc8798640..79934dc7edea 100644
--- a/offapi/com/sun/star/text/BaseIndex.idl
+++ b/offapi/com/sun/star/text/BaseIndex.idl
@@ -21,7 +21,6 @@
-
#ifndef __com_sun_star_text_BaseIndex_idl__
#define __com_sun_star_text_BaseIndex_idl__
@@ -51,7 +50,7 @@
//=
- module com { module sun { module star { module text {
+ module com { module sun { module star { module text {
//=
@@ -59,7 +58,7 @@
/** specifies the basic service of different indexes within a document.@see
com::sun::star::text::DocumentIndex
@see com::sun::star::text::ContentIndex
@see com::sun::star::text::UserDefinedIndex
-@see com::sun::star::text::IllustrationIndex
+@see com::sun::star::text::IllustrationsIndex
@see com::sun::star::text::TableIndex
@see com::sun::star::text::ObjectIndex
*/
@@ -73,7 +72,7 @@ published service BaseIndex
// DocMerge: empty anyway
[property] string Title;
-/** determins if the index is protected.*/
+/** determines if the index is protected.*/
// DocMerge: empty anyway
[property] boolean IsProtected;
@@ -161,7 +160,7 @@ published service BaseIndex
*/
// DocMerge: empty anyway
[optional, property] com::sun::star::container::XIndexReplace LevelFormat;
-/** determins if the content of the document index is created from the
+/** determines if the content of the document index is created from the
complete document content or from the current chapter only.
It is not available in the bibliography*/
[optional, property] boolean CreateFromChapter;
@@ -180,5 +179,3 @@ published service BaseIndex
}; }; }; };
#endif
-
-
diff --git a/offapi/com/sun/star/text/IllustrationsIndex.idl
b/offapi/com/sun/star/text/IllustrationsIndex.idl
index 9dbf791c6afc..a4b1748c8498 100644
--- a/offapi/com/sun/star/text/IllustrationsIndex.idl
+++ b/offapi/com/sun/star/text/IllustrationsIndex.idl
@@ -36,17 +36,17 @@ module com { module sun { module star { module text {
*/
published service IllustrationsIndex
{
-service com::sun::star::text::BaseIndex;
+service com::sun::star::text::BaseIndex;
-/* determins if the name or the label of an object is used to create the
index.
+/* determines if the name or the label of an object is used to create the
index.
*/
[optional, property] boolean CreateFromLabels; //tables, illustrations
-/* determins the name of the sequence field that is evaluated to create
the index.
+/* determines the name of the sequence field that is evaluated to create
the index.
*/
[optional, property] string LabelCategory; //tables, illustrations
-/* determins the way the paragraph containing a label is included in the
index.
+/* determines the way the paragraph containing a label is included in the
index.
@see ChapterFormat*/
-[optional, property] short LabelDisplayType;//tables, illustrations
+[optional, property] short LabelDisplayType; //tables, illustrations
};
//=
@@ -54,4 +54,3 @@ published service IllustrationsIndex
}; }; }; };
#endif
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source
sc/source/ui/formdlg/dwfunctr.src | 104 +-
1 file changed, 36 insertions(+), 68 deletions(-)
New commits:
commit 700260a171ebf6a9d35985eb1cbe31515d9253dd
Author: Matthias Seidel
AuthorDate: Wed Jun 5 14:43:46 2019 +
Commit: Matthias Seidel
CommitDate: Wed Jun 5 14:43:46 2019 +
Cleaned up whitespace, removed maskcolor
diff --git a/sc/source/ui/formdlg/dwfunctr.src
b/sc/source/ui/formdlg/dwfunctr.src
index a96c4dc45e6f..9f1e496330a5 100644
--- a/sc/source/ui/formdlg/dwfunctr.src
+++ b/sc/source/ui/formdlg/dwfunctr.src
@@ -20,12 +20,13 @@
*/
- // include ---
+
+// include ---
#include "sc.hrc"
#include "dwfunctr.hrc"
- // pragma
+// pragma
- // RID_SVXDLG_CALCFUNC --
+// RID_SVXDLG_CALCFUNC --
DockingWindow FID_FUNCTION_BOX
{
Border = TRUE ;
@@ -37,14 +38,14 @@ DockingWindow FID_FUNCTION_BOX
Zoomable = TRUE ;
Dockable = TRUE ;
EnableResizing = TRUE ;
-Size = MAP_APPFONT ( 130 , 160 ) ;
+Size = MAP_APPFONT ( 130, 160 ) ;
HelpId = HID_FUNCTION_BOX ;
ListBox CB_CAT
{
-HelpID = "sc:ListBox:FID_FUNCTION_BOX:CB_CAT";
+HelpID = "sc:ListBox:FID_FUNCTION_BOX:CB_CAT" ;
Border = TRUE ;
-Pos = MAP_APPFONT ( 20 , 4 ) ;
-Size = MAP_APPFONT ( 56 , 80 ) ;
+Pos = MAP_APPFONT ( 20, 4 ) ;
+Size = MAP_APPFONT ( 56, 80 ) ;
DropDown = TRUE ;
AutoSize = TRUE ;
TabStop = TRUE ;
@@ -52,27 +53,27 @@ DockingWindow FID_FUNCTION_BOX
AutoHScroll = TRUE ;
StringList [ en-US ] =
{
-< "Last Used" ; Default ; > ;
-< "All" ; Default ; > ;
-< "Database" ; Default ; > ;
-< "Date" ; Default ; > ;
-< "Financial" ; Default ; > ;
-< "Information" ; Default ; > ;
-< "Logical" ; Default ; > ;
-< "Mathematical" ; Default ; > ;
-< "Array" ; Default ; > ;
-< "Statistical" ; Default ; > ;
-< "Spreadsheet" ; Default ; > ;
-< "Text" ; Default ; > ;
-< "Add-in" ; Default ; > ;
+< "Last Used" ; Default ; > ;
+< "All" ; Default ; > ;
+< "Database" ; Default ; > ;
+< "Date" ; Default ; > ;
+< "Financial" ; Default ; > ;
+< "Information" ; Default ; > ;
+< "Logical" ; Default ; > ;
+< "Mathematical" ; Default ; > ;
+< "Array" ; Default ; > ;
+< "Statistical" ; Default ; > ;
+< "Spreadsheet" ; Default ; > ;
+< "Text" ; Default ; > ;
+< "Add-in" ;Default ; > ;
};
};
ListBox DDLB_FUNC
{
-HelpID = "sc:ListBox:FID_FUNCTION_BOX:DDLB_FUNC";
+HelpID = "sc:ListBox:FID_FUNCTION_BOX:DDLB_FUNC" ;
Border = TRUE ;
-Pos = MAP_APPFONT ( 103 , 4 ) ;
-Size = MAP_APPFONT ( 56 , 80 ) ;
+Pos = MAP_APPFONT ( 103, 4 ) ;
+Size = MAP_APPFONT ( 56, 80 ) ;
Hide = TRUE ;
TabStop = TRUE ;
DropDown = TRUE ;
@@ -80,10 +81,10 @@ DockingWindow FID_FUNCTION_BOX
};
ListBox LB_FUNC
{
-HelpID = "sc:ListBox:FID_FUNCTION_BOX:LB_FUNC";
+HelpID = "sc:ListBox:FID_FUNCTION_BOX:LB_FUNC" ;
Border = TRUE ;
-Pos = MAP_APPFONT ( 3 , 19 ) ;
-Size = MAP_APPFONT ( 72 , 90 ) ;
+Pos = MAP_APPFONT ( 3, 19 ) ;
+Size = MAP_APPFONT ( 72, 90 ) ;
TabStop = TRUE ;
AutoHScroll = TRUE ;
};
@@ -92,64 +93,31 @@ DockingWindow FID_FUNCTION_BOX
WordBreak = TRUE ;
Border = TRUE ;
SVLook = TRUE ;
-Pos = MAP_APPFONT ( 3 , 115 ) ;
-Size = MAP_APPFONT ( 72 , 40 ) ;
+Pos = MAP_APPFONT ( 3, 115 ) ;
+Size = MAP_APPFONT ( 72, 40 ) ;
};
Control FT_SPLIT
{
-Pos = MAP_APPFONT ( 3 , 110 ) ;
-Size = MAP_APPFONT ( 72 , 3 ) ;
+Pos =
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/sfx2
dev/null |binary 1 file changed New commits: commit 2e0153f530d6c23649e01ca7a1f1e12a5093e1e5 Author: Matthias Seidel AuthorDate: Tue Jun 4 21:56:10 2019 + Commit: Matthias Seidel CommitDate: Tue Jun 4 21:56:10 2019 + Remove unused animated graphics (StarDivision logo?) diff --git a/default_images/sfx2/res/an01.png b/default_images/sfx2/res/an01.png deleted file mode 100644 index b9dfc058c0a2.. Binary files a/default_images/sfx2/res/an01.png and /dev/null differ diff --git a/default_images/sfx2/res/an02.png b/default_images/sfx2/res/an02.png deleted file mode 100644 index 752ec39bf8e9.. Binary files a/default_images/sfx2/res/an02.png and /dev/null differ diff --git a/default_images/sfx2/res/an03.png b/default_images/sfx2/res/an03.png deleted file mode 100644 index ce195e595fb6.. Binary files a/default_images/sfx2/res/an03.png and /dev/null differ diff --git a/default_images/sfx2/res/an04.png b/default_images/sfx2/res/an04.png deleted file mode 100644 index 8c0de0f47493.. Binary files a/default_images/sfx2/res/an04.png and /dev/null differ diff --git a/default_images/sfx2/res/an05.png b/default_images/sfx2/res/an05.png deleted file mode 100644 index b61b012b0a17.. Binary files a/default_images/sfx2/res/an05.png and /dev/null differ diff --git a/default_images/sfx2/res/an06.png b/default_images/sfx2/res/an06.png deleted file mode 100644 index b72d8ba80608.. Binary files a/default_images/sfx2/res/an06.png and /dev/null differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/source scripting/README
cui/source/tabpages/frmdirlbox.src | 38 ++---
scripting/README |4 +--
2 files changed, 9 insertions(+), 33 deletions(-)
New commits:
commit 1f21ba2f2a1bc287cd869b0a03eac6e8a90eb21f
Author: Matthias Seidel
AuthorDate: Tue Jun 4 11:10:30 2019 +
Commit: Matthias Seidel
CommitDate: Tue Jun 4 11:10:30 2019 +
Fixed typo
diff --git a/scripting/README b/scripting/README
index 686e4ad30f25..bcf92f38fa11 100644
--- a/scripting/README
+++ b/scripting/README
@@ -1,6 +1,6 @@
This module provides the source code for the Scripting Framework. For
more information on the Scripting Framework, see the project web page:
-http://framework.openoffice.org/scripting/
+https://framework.openoffice.org/scripting/
Source Code Structure
=
@@ -31,7 +31,7 @@ UNO dialogs from various languages
- java/com/sun/star/script/framework/provider
Implementation of an abstract base class ScriptProvider which provides
-core methods for implementing Java based LanguageScriptProvider implemetations
+core methods for implementing Java based LanguageScriptProvider implementations
- java/com/sun/star/script/framework/provider/*
commit 99c696980cf2a97ea08ed630cf1be2af795a3b0b
Author: Matthias Seidel
AuthorDate: Tue Jun 4 11:07:44 2019 +
Commit: Matthias Seidel
CommitDate: Tue Jun 4 11:07:44 2019 +
Cleaned up whitespace
diff --git a/cui/source/tabpages/frmdirlbox.src
b/cui/source/tabpages/frmdirlbox.src
index a90758f1a442..816820609c42 100644
--- a/cui/source/tabpages/frmdirlbox.src
+++ b/cui/source/tabpages/frmdirlbox.src
@@ -27,63 +27,39 @@
String RID_SVXSTR_FRAMEDIR_LTR
{
-Text [ en-US ] = "Left-to-right";
+Text [ en-US ] = "Left-to-right" ;
};
String RID_SVXSTR_FRAMEDIR_RTL
{
-Text [ en-US ] = "Right-to-left";
+Text [ en-US ] = "Right-to-left" ;
};
String RID_SVXSTR_FRAMEDIR_SUPER
{
-Text [ en-US ] = "Use superordinate object settings";
+Text [ en-US ] = "Use superordinate object settings" ;
};
// page direction -
String RID_SVXSTR_PAGEDIR_LTR_HORI
{
-Text [ en-US ] = "Left-to-right (horizontal)";
+Text [ en-US ] = "Left-to-right (horizontal)" ;
};
String RID_SVXSTR_PAGEDIR_RTL_HORI
{
-Text [ en-US ] = "Right-to-left (horizontal)";
+Text [ en-US ] = "Right-to-left (horizontal)" ;
};
String RID_SVXSTR_PAGEDIR_RTL_VERT
{
-Text [ en-US ] = "Right-to-left (vertical)";
+Text [ en-US ] = "Right-to-left (vertical)" ;
};
String RID_SVXSTR_PAGEDIR_LTR_VERT
{
-Text [ en-US ] = "Left-to-right (vertical)";
+Text [ en-US ] = "Left-to-right (vertical)" ;
};
//
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - wizards/com
wizards/com/sun/star/wizards/ui/DocumentPreview.java |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit ed76f39cedcebf942ff926052c5730f124955d0a
Author: Matthias Seidel
AuthorDate: Wed May 29 19:29:04 2019 +
Commit: Matthias Seidel
CommitDate: Wed May 29 19:29:04 2019 +
Cleaned up whitespace, fixed typos
diff --git a/wizards/com/sun/star/wizards/ui/DocumentPreview.java
b/wizards/com/sun/star/wizards/ui/DocumentPreview.java
index d25d469cb51f..a4a678c2a12e 100644
--- a/wizards/com/sun/star/wizards/ui/DocumentPreview.java
+++ b/wizards/com/sun/star/wizards/ui/DocumentPreview.java
@@ -45,7 +45,7 @@ public class DocumentPreview
{
/**
- * The window in which the preview is showed.
+ * The window in which the preview is shown.
*/
private XWindow xWindow;
/**
@@ -67,7 +67,7 @@ public class DocumentPreview
- create new frame with window inside
- load a component as preview into this frame
- */
+*/
public DocumentPreview(XMultiServiceFactory xmsf, Object control) throws
Exception
{
@@ -137,9 +137,9 @@ public class DocumentPreview
which isn't part of the global frame tree.
Attention:
-a) This frame wont be destroyed by the office. It must be closed by you!
+a) This frame won't be destroyed by the office. It must be closed by you!
Do so - please call XCloseable::close().
-b) The container window is part of the frame. Dont hold it alive - nor try
to kill it.
+b) The container window is part of the frame. Don't hold it alive - nor
try to kill it.
It will be destroyed inside close().
*/
public void createPreviewFrame(XMultiServiceFactory xmsf, XControl
xControl) throws com.sun.star.uno.Exception,
com.sun.star.lang.IllegalArgumentException
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - comphelper/source
comphelper/source/misc/locale.cxx | 32
1 file changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 4fe42dd3d3fa3d27a5f1d8dd1db61f6f2ab3f9fb
Author: Matthias Seidel
AuthorDate: Mon May 27 22:28:42 2019 +
Commit: Matthias Seidel
CommitDate: Mon May 27 22:28:42 2019 +
Cleaned up whitespace, fixed typos
diff --git a/comphelper/source/misc/locale.cxx
b/comphelper/source/misc/locale.cxx
index 5ef0b0eaab00..eba5bc91dc46 100644
--- a/comphelper/source/misc/locale.cxx
+++ b/comphelper/source/misc/locale.cxx
@@ -375,8 +375,8 @@ Locale::Locale(const ::rtl::OUString& sLanguage,
//---
Locale::Locale()
{
-// Initialize instance ... otherwhise user will
-// may be get exceptions if he e.g. copy this instance ...
+// Initialize instance... otherwise users will
+// maybe get exceptions if he e.g. copies this instance...
(*this) = X_NOTRANSLATE();
}
@@ -424,9 +424,9 @@ void Locale::setVariant(const ::rtl::OUString& sVariant)
//---
/* Attention: Use own interface methods to set the
- different parts of this locale. Because the
+ different parts of this locale. Because they
check the incoming value and throw an exception
- automatically ...
+ automatically...
*/
void Locale::fromISO(const ::rtl::OUString& sISO)
throw(Locale::MalFormedLocaleException)
@@ -511,9 +511,9 @@ sal_Bool Locale::similar(const Locale& aComparable) const
Locale aReference(sReferenceISO);
// Note: The same language or "en"/"en-US" should be preferred as fallback.
-// On the other side some localized variables doesn't use localzation in
real.
-// May be the use a "fix" value only ... marked as X-DEFAULT or
X-NOTRANSLATE.
-// At least it can be discussed, if any language is a valid fallback ...
+// On the other side some localized variables don't use localization in
real.
+// Maybe they use a "fix" value only... marked as X-DEFAULT or
X-NOTRANSLATE.
+// At least it can be discussed, if any language is a valid fallback...
// But in case some office functionality depends on that (that means real
functionality instead
// of pure UI descriptions) we should do anything, so it can work.
@@ -534,7 +534,7 @@ sal_Bool Locale::similar(const Locale& aComparable) const
if (aCheck.equals(aReference))
return pIt;
-// found similar Locale => safe it as possible fallback
+// found similar Locale => save it as possible fallback
if (
(pSimilar == lISOList.end()) &&
(aCheck.similar(aReference))
@@ -543,7 +543,7 @@ sal_Bool Locale::similar(const Locale& aComparable) const
pSimilar = pIt;
}
else
-// found en-US => safe it as fallback
+// found en-US => save it as fallback
if (
(pEN_US == lISOList.end()) &&
(aCheck.equals(EN_US()) )
@@ -552,7 +552,7 @@ sal_Bool Locale::similar(const Locale& aComparable) const
pEN_US = pIt;
}
else
-// found en[-XX] => safe it as fallback
+// found en[-XX] => save it as fallback
if (
(pEN == lISOList.end() ) &&
(aCheck.similar(EN_US()))
@@ -561,7 +561,7 @@ sal_Bool Locale::similar(const Locale& aComparable) const
pEN = pIt;
}
else
-// found an explicit default value(!) => safe it as fallback
+// found an explicit default value(!) => save it as fallback
if (
(pXDefault == lISOList.end()) &&
(aCheck.equals(X_DEFAULT()) )
@@ -570,7 +570,7 @@ sal_Bool Locale::similar(const Locale& aComparable) const
pXDefault = pIt;
}
else
-// found an implicit default value(!) => safe it as fallback
+// found an implicit default value(!) => save it as fallback
if (
(pXNoTranslate == lISOList.end()) &&
(aCheck.equals(X_NOTRANSLATE()) )
@@ -579,7 +579,7 @@ sal_Bool Locale::similar(const Locale& aComparable) const
pXNoTranslate = pIt;
}
else
-// safe the first locale, which isn't an explicit fallback
+// save the first locale, which isn't an explicit fallback
// as "last possible fallback"
if (pAny == lISOList.end())
pAny = pIt;
@@ -611,7 +611,7 @@ sal_Bool Locale::getFallback(Locale& aLocale)
{
// a)
// this was our last fallback!
-// break any further calls to this method ...
+// break any further calls to this method...
if (aLocale.equals(X_NOTRANSLATE()))
return sal_False;
@@ -655,8 +655,8 @@ sal_Bool Locale::getFallback(
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - accessibility/source
accessibility/source/standard/vclxaccessibletoolbox.cxx | 36
1 file changed, 18 insertions(+), 18 deletions(-)
New commits:
commit a3447da684555d06a0731deabf72da7e371d5727
Author: Matthias Seidel
AuthorDate: Sat May 25 21:00:06 2019 +
Commit: Matthias Seidel
CommitDate: Sat May 25 21:00:06 2019 +
Cleaned up whitespace, fixed typos
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx
b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index e4cebc53f461..c37e1846767f 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -65,7 +65,7 @@ namespace
_rxORB,
_rxInnerAccessibleContext,
_rxOwningAccessible,
-_rxParentAccessible )
+_rxParentAccessible)
,m_nIndexInParent(_nIndexInParent)
{
}
@@ -98,7 +98,7 @@ namespace
inline sal_Int32getIndexInParent() const{
return m_nIndexInParent; }
inline void setIndexInParent( sal_Int32 _nNewIndex ){
m_nIndexInParent = _nNewIndex; }
-static sal_BoolisWindowItem( const Reference< XAccessible >&
_rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation = NULL );
+static sal_Bool isWindowItem( const Reference< XAccessible >& _rxAcc,
OToolBoxWindowItem** /* [out] */ _ppImplementation = NULL );
public:
OToolBoxWindowItem(sal_Int32 _nIndexInParent,
@@ -174,7 +174,7 @@ namespace
sal_Int64 SAL_CALL OToolBoxWindowItem::getSomething( const Sequence<
sal_Int8 >& _rId ) throw (RuntimeException)
{
if ( ( 16 == _rId.getLength() )
-&& ( 0 == rtl_compareMemory(
getUnoTunnelImplementationId().getConstArray(), _rId.getConstArray(), 16 ) )
+&& ( 0 == rtl_compareMemory(
getUnoTunnelImplementationId().getConstArray(), _rId.getConstArray(), 16 ) )
)
return reinterpret_cast< sal_Int64>( this );
@@ -208,7 +208,7 @@ VCLXAccessibleToolBoxItem*
VCLXAccessibleToolBox::GetItem_Impl( sal_Int32 _nPos,
{
ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.find( _nPos );
// returns only toolbox buttons, not windows
-if ( aIter != m_aAccessibleChildren.end() && aIter->second.is())
+if ( aIter != m_aAccessibleChildren.end() && aIter->second.is())
pItem = static_cast< VCLXAccessibleToolBoxItem* >(
aIter->second.get() );
}
@@ -240,7 +240,7 @@ void VCLXAccessibleToolBox::UpdateFocus_Impl()
sal_uInt16 nHighlightItemId = pToolBox->GetHighlightItemId();
sal_uInt16 nFocusCount = 0;
for ( ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.begin();
- aIter != m_aAccessibleChildren.end(); ++aIter )
+aIter != m_aAccessibleChildren.end(); ++aIter )
{
sal_uInt16 nItemId = pToolBox->GetItemId( (sal_uInt16)aIter->first
);
@@ -293,7 +293,7 @@ void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32
_nPos )
VCLXAccessibleToolBoxItem* pFocusItem = NULL;
for ( ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.begin();
- aIter != m_aAccessibleChildren.end(); ++aIter )
+aIter != m_aAccessibleChildren.end(); ++aIter )
{
sal_uInt16 nItemId = pToolBox->GetItemId(
(sal_uInt16)aIter->first );
@@ -303,7 +303,7 @@ void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32
_nPos )
if ( nItemId == nFocusId )
pFocusItem = pItem;
}
-//Solution:If the position is not a child item,the focus should not be
called
+// Solution: If the position is not a child item, the focus should not
be called
if ( pFocusItem && (sal_uInt16)_nPos != TOOLBOX_ITEM_NOTFOUND )
pFocusItem->SetFocus( sal_True );
}
@@ -429,7 +429,7 @@ void VCLXAccessibleToolBox::UpdateAllItems_Impl()
{
// deregister the old items
for ( ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.begin();
-aIter != m_aAccessibleChildren.end(); ++aIter )
+aIter != m_aAccessibleChildren.end(); ++aIter )
{
implReleaseToolboxItem( aIter, true, true );
}
@@ -557,7 +557,7 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const
VclWindowEvent& rVclWindow
else if( pToolBox->GetItemPos(pToolBox->GetCurItemId()) !=
TOOLBOX_ITEM_NOTFOUND )
{
UpdateChecked_Impl(
pToolBox->GetItemPos(pToolBox->GetCurItemId()) );
-UpdateIndeterminate_Impl(
pToolBox->GetItemPos(pToolBox->GetCurItemId()) );
+UpdateIndeterminate_Impl(
pToolBox->GetItemPos(pToolBox->GetCurItemId()) )
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - i18npool/source
i18npool/source/localedata/data/ltg_LV.xml | 23 +++ 1 file changed, 15 insertions(+), 8 deletions(-) New commits: commit c55c6a04e9f9389f1726a88a6217ddc6ecaa9f45 Author: Matthias Seidel AuthorDate: Thu May 23 21:58:25 2019 + Commit: Matthias Seidel CommitDate: Thu May 23 21:58:25 2019 + Set default currency to Euro in Latgalian (ltg-LV) locale diff --git a/i18npool/source/localedata/data/ltg_LV.xml b/i18npool/source/localedata/data/ltg_LV.xml index cf8c806976cc..dff895d97a2f 100644 --- a/i18npool/source/localedata/data/ltg_LV.xml +++ b/i18npool/source/localedata/data/ltg_LV.xml @@ -85,22 +85,22 @@ 0,00% - + [$Ls-64B] # ##0;[$Ls-64B] -# ##0 - + [$Ls-64B] # ##0,00;[$Ls-64B] -# ##0,00 - + [$Ls-64B] # ##0;[RED][$Ls-64B] -# ##0 - + [$Ls-64B] # ##0,00;[RED][$Ls-64B] -# ##0,00 - + # ##0,00 CCC - + [$Ls-64B] # ##0,--;[RED][$Ls-64B] -# ##0,-- @@ -335,7 +335,14 @@ - + + EUR + € + EUR + euro + 2 + + LVL Ls LVL @@ -367,4 +374,4 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source
vcl/source/app/svdata.cxx | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
New commits:
commit e77524cb2eb6e1a6ecdcfc914bbf77a8b084cb53
Author: Matthias Seidel
AuthorDate: Wed May 22 23:41:32 2019 +
Commit: Matthias Seidel
CommitDate: Wed May 22 23:41:32 2019 +
Cleaned up whitespace, fixed typos
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 139c5e689ded..1c3b641a572d 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -56,7 +56,7 @@
#include "vcl/msgbox.hxx"
#include "vcl/unohelp.hxx"
#include "vcl/button.hxx" // for Button::GetStandardText
-#include "vcl/dockwin.hxx" // for DockingManager
+#include "vcl/dockwin.hxx" // for DockingManager
#include "salinst.hxx"
#include "salframe.hxx"
@@ -146,11 +146,11 @@ void ImplInitSVData()
}
}
#ifdef WNT
-//Default enable the acc bridge interface
+// Default enable the acc bridge interface
pImplSVData->maAppData.m_bEnableAccessInterface =true;
#endif
-// mark default layout border as unitialized
+// mark default layout border as uninitialized
pImplSVData->maAppData.mnDefaultLayoutBorder = -1;
}
@@ -212,7 +212,7 @@ Window* ImplGetDefaultWindow()
return pSVData->maWinData.mpAppWin;
// First test if we already have a default window.
-// Don't only place a single if..else inside solar mutex lockframe
+// Don't only place a single if...else inside solar mutex lockframe
// because then we might have to wait for the solar mutex what is not
necessary
// if we already have a default window.
@@ -346,7 +346,7 @@ com::sun::star::uno::Any
AccessBridgeCurrentContext::getValueByName( const rtl::
com::sun::star::uno::Any ret;
if( Name.equalsAscii( "java-vm.interaction-handler" ) )
{
-// Currently, for accessbility no interaction handler shall be offered.
+// Currently, for accessibility no interaction handler shall be
offered.
// There may be introduced later on a handler using native toolkits
// jbu->obr: Instantiate here your interaction handler
}
@@ -448,13 +448,13 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool
)
// if bAllowCancel is sal_True we were called from application startup
// where we will disable any Java errorboxes and show our own
accessibility dialog if Java throws an exception
// if bAllowCancel is sal_False we were called from Tools->Options
-// where we will see Java errorboxes, se we do not show our dialogs in
addition to Java's
+// where we will see Java errorboxes, so we do not show our dialogs in
addition to Java's
try
{
sal_Bool bSuccess = sal_True;
-// No error messages when env var is set ..
+// No error messages when env var is set...
static const char* pEnv = getenv("SAL_ACCESSIBILITY_ENABLED" );
if( pEnv && *pEnv )
{
@@ -490,7 +490,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool
)
// Disable default java error messages on startup, because
they were probably unreadable
// for a disabled user. Use native message boxes which are
accessible without java support.
-// No need to do this when activated by Tools-Options dialog ..
+// No need to do this when activated by Tools-Options dialog...
if( bAllowCancel )
{
// customize the java-not-available-interaction-handler
entry within the
@@ -684,7 +684,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool
)
Window* ImplFindWindow( const SalFrame* pFrame, ::Point& rSalFramePos )
{
ImplSVData* pSVData = ImplGetSVData();
-Window* pFrameWindow = pSVData->maWinData.mpFirstFrame;
+Window* pFrameWindow = pSVData->maWinData.mpFirstFrame;
while ( pFrameWindow )
{
if ( pFrameWindow->ImplGetFrame() == pFrame )
@@ -705,4 +705,3 @@ void LocaleConfigurationListener::ConfigurationChanged(
utl::ConfigurationBroadc
{
AllSettings::LocaleSettingsChanged( nHint );
}
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst
external_deps.lst |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit b07a7bac7c795a45c0cc8516a097ae4df4d13872 Author: Matthias Seidel AuthorDate: Tue May 21 15:50:19 2019 + Commit: Matthias Seidel CommitDate: Tue May 21 15:50:19 2019 + Further updates to links diff --git a/external_deps.lst b/external_deps.lst index e8943cf0f4d4..87216d493d64 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -24,7 +24,6 @@ # longer, server is temporarily not available) a fallback server is used. # The primary fallback site. -# OOO_EXTRAS=http://ooo-extras.apache-extras.org.codespot.com/files/ OOO_EXTRAS=https://sourceforge.net/projects/oooextras.mirror/files/ @@ -238,13 +237,13 @@ if (WITH_CATA_FONTS == YES) if (WITH_CATA_FONTS==YES) MD5 = 3c90ac73fd13bd79684d9dc073840328 name = croscorefonts-1.31.0.tar.bz2 -URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name) +URL1 = https://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (WITH_CATA_FONTS==YES) MD5 = 368f114c078f94214a308a74c7e991bc name = crosextrafonts-20130214.tar.gz -URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name) +URL1 = https://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if ( true ) @@ -279,7 +278,7 @@ if (ENABLE_CATEGORY_B==YES && SYSTEM_COINMP!=YES) if (WITH_CATB_FONTS==YES) MD5 = c74b7223abe75949b4af367942d96c7a name = crosextrafonts-carlito-20130920.tar.gz -URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name) +URL1 = https://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (WITH_CATB_FONTS == YES) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst
external_deps.lst | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 148295be26870f869faabc75b65dfb16a8df2924 Author: Matthias Seidel AuthorDate: Tue May 21 13:06:50 2019 + Commit: Matthias Seidel CommitDate: Tue May 21 13:06:50 2019 + Updated links diff --git a/external_deps.lst b/external_deps.lst index 69fdbc0b2e62..e8943cf0f4d4 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -59,7 +59,7 @@ if (SYSTEM_MDDS != YES) if (SYSTEM_LIBTEXTCAT != YES) MD5 = 128cfc86ed5953e57fe0f5ae98b62c2e name = libtextcat-2.2.tar.gz -URL1 = http://software.wise-guys.nl/download/libtextcat-2.2.tar.gz +URL1 = https://software.wise-guys.nl/download/libtextcat-2.2.tar.gz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SOLAR_JAVA == TRUE) @@ -142,7 +142,7 @@ if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES)) if (SYSTEM_JPEG != YES) MD5 = 52654eb3b2e60c35731ea8fc87f1bd29 name = jpeg-8d.tar.gz -URL1 = http://www.ijg.org/files/jpegsrc.v8d.tar.gz +URL1 = https://www.ijg.org/files/jpegsrc.v8d.tar.gz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SOLAR_JAVA==TRUE) @@ -154,7 +154,7 @@ if (SOLAR_JAVA==TRUE) if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE) MD5 = ac5eb30bf5798aa14b1ae6d0e7da58df name = openssl-1.0.2p.tar.gz -URL1 = http://www.openssl.org/source/openssl-1.0.2p.tar.gz +URL1 = https://www.openssl.org/source/openssl-1.0.2p.tar.gz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if ( true ) @@ -202,7 +202,7 @@ if (ENABLE_MEDIAWIKI == YES) if (SYSTEM_PYTHON != YES) MD5 = 045fb3440219a1f6923fefdabde63342 name = Python-2.7.15.tgz -URL1 = http://www.python.org/ftp/python/2.7.15/Python-2.7.15.tgz +URL1 = https://www.python.org/ftp/python/2.7.15/Python-2.7.15.tgz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_BOOST != YES) @@ -285,7 +285,7 @@ if (WITH_CATB_FONTS==YES) if (WITH_CATB_FONTS == YES) MD5 = 1725634df4bb3dcb1b2c91a6175f8789 name = GentiumBasic_1102.zip -URL1 = http://software.sil.org/downloads/d/gentium/GentiumBasic_1102.zip +URL1 = https://software.sil.org/downloads/r/gentium/GentiumBasic_1102.zip URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (ENABLE_CATEGORY_B==YES && SYSTEM_HYPH!=YES) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - filter/source i18npool/source
filter/source/config/cache/querytokenizer.hxx | 10 ++--
i18npool/source/localedata/data/lv_LV.xml | 59 ++
2 files changed, 38 insertions(+), 31 deletions(-)
New commits:
commit 78d3e4d1261b9e6923e989a2e419ca004ea33a1f
Author: Matthias Seidel
AuthorDate: Mon May 20 21:18:10 2019 +
Commit: Matthias Seidel
CommitDate: Mon May 20 21:18:10 2019 +
Fixed typos
diff --git a/filter/source/config/cache/querytokenizer.hxx
b/filter/source/config/cache/querytokenizer.hxx
index 0d1d3c173bd8..c642527a830e 100644
--- a/filter/source/config/cache/querytokenizer.hxx
+++ b/filter/source/config/cache/querytokenizer.hxx
@@ -53,8 +53,8 @@ namespace filter{
uses this schema.
-@attention This class is not threadsafe implemented. Because its not
necessary.
-But you have to make shure, that ist not used as such :-)
+@attention This class is not threadsafe implemented. Because it's not
necessary.
+But you have to make sure, that it's not used as such :-)
*/
class QueryTokenizer : public ::std::hash_map< ::rtl::OUString
,
::rtl::OUString
,
@@ -69,7 +69,7 @@ class QueryTokenizer : public ::std::hash_map< ::rtl::OUString
/** @short Because the given query can contain errors,
it should be checked outside.
-TODOMay its a good idea to describe the real problem
+TODOMaybe it's a good idea to describe the real problem
more detailed ...
*/
sal_Bool m_bValid;
@@ -82,9 +82,9 @@ class QueryTokenizer : public ::std::hash_map< ::rtl::OUString
/** @short create a new tokenizer instance with a
a new query.
-@descr The given query is immidiatly analyzed
+@descr The given query is immediately analyzed
and separated into its token, which can
-be access by some specialized method later.
+be accessed by some specialized method later.
@param sQuery
the query string.
commit ff5b97cafcf7438dae4e07b432803eb2da89fa37
Author: Matthias Seidel
AuthorDate: Mon May 20 20:27:00 2019 +
Commit: Matthias Seidel
CommitDate: Mon May 20 20:27:00 2019 +
Set default currency to Euro in Latvian locale
diff --git a/i18npool/source/localedata/data/lv_LV.xml
b/i18npool/source/localedata/data/lv_LV.xml
index 2bf704261b3f..a3d4cdb6b5e9 100644
--- a/i18npool/source/localedata/data/lv_LV.xml
+++ b/i18npool/source/localedata/data/lv_LV.xml
@@ -55,52 +55,52 @@
metric
-
+
Standard
-
+
0
-
+
0,00
-
+
# ##0
-
+
# ##0,00
-
+
# ###,00
-
+
0,00E+000
-
+
0,00E+00
-
+
0%
-
+
0,00%
-
+
[$Ls-426] # ##0;[$Ls-426] -# ##0
-
+
[$Ls-426] # ##0,00;[$Ls-426] -# ##0,00
-
+
[$Ls-426] # ##0;[RED][$Ls-426] -# ##0
-
+
[$Ls-426] # ##0,00;[RED][$Ls-426] -# ##0,00
-
+
# ##0,00 CCC
-
+
[$Ls-426] # ##0,--;[RED][$Ls-426] -# ##0,--
@@ -168,31 +168,31 @@
WW
-
+
HH:MM
-
+
HH:MM:SS
-
+
HH:MM AM/PM
-
+
HH:MM:SS AM/PM
-
+
[HH]:MM:SS
-
+
MM:SS,00
-
+
[HH]:MM:SS,00
-
+
DD.MM.YY HH:MM
-
+
DD.MM. HH:MM:SS
@@ -335,7 +335,14 @@
-
+
+ EUR
+ €
+ EUR
+ euro
+ 2
+
+
LVL
Ls
LVL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - framework/inc
framework/inc/threadhelp/lockhelper.hxx | 20 ++--
framework/inc/threadhelp/transactionbase.hxx |8
2 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 2c6a517e53b89fc923691f59e0435949db5e28eb
Author: Matthias Seidel
AuthorDate: Sun May 19 11:59:15 2019 +
Commit: Matthias Seidel
CommitDate: Sun May 19 11:59:15 2019 +
Fixed typos
diff --git a/framework/inc/threadhelp/lockhelper.hxx
b/framework/inc/threadhelp/lockhelper.hxx
index b6d49e68d683..4f2e16cce891 100644
--- a/framework/inc/threadhelp/lockhelper.hxx
+++ b/framework/inc/threadhelp/lockhelper.hxx
@@ -55,10 +55,10 @@ namespace framework{
//_
/*-//**
-@descr If you use a lock or mutex as a member of your class and
whish to use it earlier then other ones
+@descr If you use a lock or mutex as a member of your class and
wish to use it earlier than other ones
you should have a look on this implementation. You must
use it as the first base class
of your implementation - because base classes are
initialized by his order and before your
-member! Thats why ist a good place to declare your thread
help member so.
+member! Thats why it is a good place to declare your
thread help member so.
*//*-*/
enum ELockType
{
@@ -72,21 +72,21 @@ enum ELockType
#define FALLBACK_LOCKTYPE E_SOLARMUTEX
//_
-// declarations
+// declarations
//_
/*-//**
@short helper to set right lock in right situation
@descr This helper support different types of locking:
a) no locks - transparent for user!
-This could be useful for simluation or single
threaded environments!
+This could be useful for simulation or single
threaded environments!
b) own mutex
-An object use his own osl-mutex to be threadsafe.
Useful for easy and exclusiv locking.
+An object use his own osl-mutex to be threadsafe.
Useful for easy and exclusive locking.
c) solar mutex
-An object use our solar mutex and will be a part
of a greater safed "threadsafe code block".
+An object use our solar mutex and will be a part
of a greater saved "threadsafe code block".
Could be useful for simulation and testing of
higher modules!
d) fair rw-lock
-An object use an implementation of a fair rw-lock.
This increase granularity of t hreadsafe mechanism
+An object use an implementation of a fair rw-lock.
This increase granularity of threadsafe mechanism
and should be used for high performance threadsafe
code!
@attention We support two interfaces - "IMutex" and "IRWLock". Don't
mix using of it!
@@ -157,8 +157,8 @@ class FWI_DLLPUBLIC LockHelper : public IMutex
// ii ) Otherwise you have no osl
mutex ... so you must create "m_pShareableOslMutex" and use it twice!
// In this case you must lock
two members every time - "m_pShareableMutex" AND "m_pFairRWLock" or
"m_pSolarMutex" or ...
// It isn't really fine - but
the only possible way.
-// iii) There exist another
special case - E_NOTHING is set! Then we should create this shareable mutex ...
-// nad you can use it ... but
this implmentation ignore it.
+// iii) There exists another
special case - E_NOTHING is set! Then we should create this shareable mutex ...
+// and you can use it ... but
this implementation ignores it.
//-
private:
@@ -171,6 +17
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 6 commits - filter/source Module_ooo.mk officecfg/registry rat-excludes sc/source testgraphical/Ant_ConvwatchGUIProject.mk testgraphical/Makefile t
Module_ooo.mk |1
filter/source/config/cache/filtercache.cxx | 152 -
officecfg/registry/data/org/openoffice/Office/Calc.xcu | 37 +++-
rat-excludes |5
sc/source/core/tool/interpr2.cxx |5
testgraphical/Ant_ConvwatchGUIProject.mk | 28 +++
testgraphical/Makefile | 32 +++
testgraphical/Module_testgraphical.mk | 34 +++
testgraphical/prj/build.lst|3
testgraphical/prj/makefile.mk | 44
wizards/source/euro/Common.xba | 28 +--
wizards/source/euro/DlgConvert.xdl |2
wizards/source/euro/Protect.xba| 18 +-
13 files changed, 282 insertions(+), 107 deletions(-)
New commits:
commit 7c244d0f7d0f47a39375afbc056af1fd2df00f3b
Author: Matthias Seidel
AuthorDate: Thu May 16 15:08:22 2019 +
Commit: Matthias Seidel
CommitDate: Thu May 16 15:08:22 2019 +
Fixed a lot of typos
diff --git a/filter/source/config/cache/filtercache.cxx
b/filter/source/config/cache/filtercache.cxx
index 17b7b453c4a1..e80f9ed289a4 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -72,8 +72,8 @@ namespace css = ::com::sun::star;
// definitions
// Error message in case filter config seems to be corrupted.
-// Note: Dont tell user something about "setup -repair"!
-// Its no longer supported by using native installers ...
+// Note: Don't tell user something about "setup -repair"!
+// It's no longer supported by using native installers ...
static ::rtl::OUString MESSAGE_CORRUPTED_FILTERCONFIG =
::rtl::OUString::createFromAscii("The filter configuration appears to be
defective. Please install the office suite again.");
/*---
@@ -105,7 +105,7 @@ FilterCache* FilterCache::clone() const
FilterCache* pClone = new FilterCache();
-// Dont copy the configuration access points here.
+// Don't copy the configuration access points here.
// They will be created on demand inside the cloned instance,
// if they are needed.
@@ -145,7 +145,7 @@ void FilterCache::takeOver(const FilterCache& rClone)
::osl::ResettableMutexGuard aLock(m_aLock);
// a)
-// Dont copy the configuration access points here!
+// Don't copy the configuration access points here!
// We must use our own ones ...
// b)
@@ -154,7 +154,7 @@ void FilterCache::takeOver(const FilterCache& rClone)
// c)
// Take over only changed items!
-// Otherwhise we risk the following scenario:
+// Otherwise we risk the following scenario:
// c1) clone_1 contains changed filters
// c2) clone_2 container changed types
// c3) clone_1 take over changed filters and unchanged types
@@ -178,12 +178,12 @@ void FilterCache::takeOver(const FilterCache& rClone)
m_lChangedFrameLoaders.clear();
m_lChangedContentHandlers.clear();
-m_sActLocale = rClone.m_sActLocale;
+m_sActLocale = rClone.m_sActLocale;
m_sProductName = rClone.m_sProductName;
m_sOOoXMLFormatName = rClone.m_sOOoXMLFormatName;
m_sOOoXMLFormatVersion = rClone.m_sOOoXMLFormatVersion;
-m_eFillState = rClone.m_eFillState;
+m_eFillState = rClone.m_eFillState;
// renew all dependencies and optimizations
// Because we can't be sure, that changed filters on one clone
@@ -226,10 +226,10 @@ void FilterCache::load(EFillState eRequired,
}
#endif
-// Otherwhise load the missing items.
+// Otherwise load the missing items.
// --
-// a) load some const values from configration.
+// a) load some const values from configuration.
//These values are needed there for loading
//config items ...
//Further we load some std items from the
@@ -260,13 +260,13 @@ void FilterCache::load(EFillState eRequired,
m_sOOoXMLFormatVersion = DEFAULT_FORMATVERSION;
}
-// Support the old configuration support. Read it only one times
during office runtime!
+// Support the old configuration support. Read it only one time during
office runtime!
impl_readOldFormat();
// enable "loadOnDemand" feature ...
// Create uno listener, which waits for finishing the office startup
// and starts a thread, which calls loadAll() at this filter cache.
-// Note: Its not a leak to create this listener with new here.
+// Note: It's not a leak to create this listener with new here.
// It kills itself after working!
/* LateInitListener* pLateInit = */ new LateInitListener(m_xSMGR);
}
@@ -303,8 +303,8
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extras/source
extras/source/misc_config/wizard/web/styles/beige.css|1 +
extras/source/misc_config/wizard/web/styles/bg.css |1 +
extras/source/misc_config/wizard/web/styles/bgr.css |1 +
extras/source/misc_config/wizard/web/styles/bgrey.css|1 +
extras/source/misc_config/wizard/web/styles/bwb.css |1 +
extras/source/misc_config/wizard/web/styles/bwo.css |1 +
extras/source/misc_config/wizard/web/styles/dark.css |1 +
extras/source/misc_config/wizard/web/styles/dp.css |1 +
extras/source/misc_config/wizard/web/styles/forest.css |1 +
extras/source/misc_config/wizard/web/styles/green.css|1 +
extras/source/misc_config/wizard/web/styles/greenred.css |1 +
extras/source/misc_config/wizard/web/styles/grey.css |1 +
extras/source/misc_config/wizard/web/styles/ibg.css |1 +
extras/source/misc_config/wizard/web/styles/ice.css |1 +
extras/source/misc_config/wizard/web/styles/marine.css |1 +
extras/source/misc_config/wizard/web/styles/orange.css |1 +
extras/source/misc_config/wizard/web/styles/red.css |1 +
extras/source/misc_config/wizard/web/styles/rgb.css |1 +
extras/source/misc_config/wizard/web/styles/strange.css |1 +
extras/source/misc_config/wizard/web/styles/violet.css |1 +
extras/source/misc_config/wizard/web/styles/water.css|1 +
21 files changed, 21 insertions(+)
New commits:
commit 0b9ae923ca73de806383da359e80c02d2f235dc2
Author: Matthias Seidel
AuthorDate: Wed May 8 21:10:29 2019 +
Commit: Matthias Seidel
CommitDate: Wed May 8 21:10:29 2019 +
Re-added "background.gif" to css.
The background graphic is converted to GIF from the wizard. So it is still
needed.
diff --git a/extras/source/misc_config/wizard/web/styles/beige.css
b/extras/source/misc_config/wizard/web/styles/beige.css
index ad7ae9941da8..16b395727f3f 100644
--- a/extras/source/misc_config/wizard/web/styles/beige.css
+++ b/extras/source/misc_config/wizard/web/styles/beige.css
@@ -70,6 +70,7 @@
}
body {
background-color: #FFCC99;
+ background-image: url(images/background.gif);
}
.toctitle {
font-family: "Times New Roman", Times, serif;
diff --git a/extras/source/misc_config/wizard/web/styles/bg.css
b/extras/source/misc_config/wizard/web/styles/bg.css
index cfa0cc80cb32..6bf30efdcdfe 100644
--- a/extras/source/misc_config/wizard/web/styles/bg.css
+++ b/extras/source/misc_config/wizard/web/styles/bg.css
@@ -70,6 +70,7 @@
}
body {
background-color: #660033;
+ background-image: url(images/background.gif);
}
.toctitle {
font-family: Arial, Helvetica, sans-serif;
diff --git a/extras/source/misc_config/wizard/web/styles/bgr.css
b/extras/source/misc_config/wizard/web/styles/bgr.css
index 0a1d2fc90a46..a80fd7e16272 100644
--- a/extras/source/misc_config/wizard/web/styles/bgr.css
+++ b/extras/source/misc_config/wizard/web/styles/bgr.css
@@ -70,6 +70,7 @@
}
body {
background-color: #660033;
+ background-image: url(images/background.gif);
}
.toctitle {
font-family: Arial, Helvetica, sans-serif;
diff --git a/extras/source/misc_config/wizard/web/styles/bgrey.css
b/extras/source/misc_config/wizard/web/styles/bgrey.css
index 153d72423f3e..84d99fb064d3 100644
--- a/extras/source/misc_config/wizard/web/styles/bgrey.css
+++ b/extras/source/misc_config/wizard/web/styles/bgrey.css
@@ -70,6 +70,7 @@
}
body {
background-color: #00;
+ background-image: url(images/background.gif);
}
.toctitle {
font-family: "Times New Roman", Times, serif;
diff --git a/extras/source/misc_config/wizard/web/styles/bwb.css
b/extras/source/misc_config/wizard/web/styles/bwb.css
index 6cd68c930469..15a5d2ad6548 100644
--- a/extras/source/misc_config/wizard/web/styles/bwb.css
+++ b/extras/source/misc_config/wizard/web/styles/bwb.css
@@ -70,6 +70,7 @@
}
body {
background-color: #99;
+ background-image: url(images/background.gif);
}
.toctitle {
font-family: Arial, Helvetica, sans-serif;
diff --git a/extras/source/misc_config/wizard/web/styles/bwo.css
b/extras/source/misc_config/wizard/web/styles/bwo.css
index ba7a707b33f3..5dd9585207d9 100644
--- a/extras/source/misc_config/wizard/web/styles/bwo.css
+++ b/extras/source/misc_config/wizard/web/styles/bwo.css
@@ -70,6 +70,7 @@
}
body {
background-color: #66;
+ background-image: url(images/background.gif);
}
.toctitle {
font-family: Arial, Helvetica, sans-serif;
diff --git a/extras/source/misc_config/wizard/web/styles/dark.css
b/extras/source/misc_config/wizard/web/styles/dark.css
index 69974adfff10..5d4cdc25de56 100644
--- a/extras/source/misc_config/wizard/web/styles/dark.css
+++ b/extras/source/misc_config/wizard/web/styles/dark.css
@@ -70,6 +70,7 @@
}
body {
background-color: #00;
+ background-image: url(images/background.gif);
}
.
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - config.guess config.sub extras/source
config.guess | 218 +--
config.sub | 46 +--
extras/source/misc_config/wizard/web/styles/beige.css|9
extras/source/misc_config/wizard/web/styles/bg.css |9
extras/source/misc_config/wizard/web/styles/bgr.css |9
extras/source/misc_config/wizard/web/styles/bgrey.css|9
extras/source/misc_config/wizard/web/styles/bwb.css |9
extras/source/misc_config/wizard/web/styles/bwo.css |9
extras/source/misc_config/wizard/web/styles/dark.css |9
extras/source/misc_config/wizard/web/styles/dp.css |9
extras/source/misc_config/wizard/web/styles/forest.css |9
extras/source/misc_config/wizard/web/styles/green.css|9
extras/source/misc_config/wizard/web/styles/greenred.css |9
extras/source/misc_config/wizard/web/styles/grey.css |9
extras/source/misc_config/wizard/web/styles/ibg.css |9
extras/source/misc_config/wizard/web/styles/ice.css |9
extras/source/misc_config/wizard/web/styles/marine.css |9
extras/source/misc_config/wizard/web/styles/orange.css |9
extras/source/misc_config/wizard/web/styles/pc_old.css | 112 ---
extras/source/misc_config/wizard/web/styles/red.css |9
extras/source/misc_config/wizard/web/styles/rgb.css | 25 -
extras/source/misc_config/wizard/web/styles/strange.css |9
extras/source/misc_config/wizard/web/styles/violet.css |9
extras/source/misc_config/wizard/web/styles/water.css|9
24 files changed, 314 insertions(+), 267 deletions(-)
New commits:
commit bbd329211b80fa107d93f1a2363512a872b8d6df
Author: Matthias Seidel
AuthorDate: Wed May 8 19:17:39 2019 +
Commit: Matthias Seidel
CommitDate: Wed May 8 19:17:39 2019 +
Updated to the latest version:
- config.guess: 2019-04-28
- config.sub: 2019-01-05
diff --git a/config.guess b/config.guess
index b33c9e890e0c..4cd9454b35c4 100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2018 Free Software Foundation, Inc.
+# Copyright 1992-2019 Free Software Foundation, Inc.
-timestamp='2018-08-29'
+timestamp='2019-04-28'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2019 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -96,8 +96,7 @@ fi
tmp=
# shellcheck disable=SC2172
-trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15
-trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
set_cc_for_build() {
: "${TMPDIR=/tmp}"
@@ -392,15 +391,20 @@ case
"$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
echo i386-pc-auroraux"$UNAME_RELEASE"
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
- case `isainfo -b` in
- 32)
- echo i386-pc-solaris2"$UNAME_REL"
- ;;
- 64)
- echo x86_64-pc-solaris2"$UNAME_REL"
- ;;
- esac
+ set_cc_for_build
+ SUN_ARCH=i386
+ # If there is a compiler, see if it is configured for 64-bit objects.
+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ # This test works for both compilers.
+ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ SUN_ARCH=x86_64
+ fi
+ fi
+ echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
@@ -890,7 +894,7 @@ EOF
echo "$UNAME_MACHINE"-pc-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-unknown-cygwin
+ echo x86_64-pc-cygwin
exit ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e
's/[^.]*//'`"
@@ -981,22 +985,50 @@ EOF
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
set_cc_for_build
+
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - starmath/source
starmath/source/toolbox.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b0a43fc66fdc2a4aacff989de7c3d5034a917b69
Author: Matthias Seidel
AuthorDate: Sun May 5 17:45:04 2019 +
Commit: Matthias Seidel
CommitDate: Sun May 5 17:45:04 2019 +
Set initial size to 5 lines for math toolbox
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index bcbfa00b8f67..45a7c8f22dda 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -256,7 +256,7 @@ void SmToolBoxWindow::StateChanged( StateChangedType
nStateChange )
void SmToolBoxWindow::AdjustPosSize( sal_Bool bSetPos )
{
Size aCatSize( aToolBoxCat.CalcWindowSizePixel( 2 ) );
-Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( 4 /* see nLines in
SetCategory */ ) );
+Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( 5 /* see nLines in
SetCategory */ ) );
DBG_ASSERT( aCatSize.Width() == aCmdSize.Width(), "width mismatch" );
// catalog settings
@@ -324,7 +324,7 @@ void SmToolBoxWindow::SetCategory(sal_uInt16 nCategoryRID)
// check for valid resource id
switch (nCategoryRID)
{
-case RID_UNBINOPS_CAT : nLines = 4; break;
+case RID_UNBINOPS_CAT : nLines = 5; break;
case RID_RELATIONS_CAT: nLines = 5; break;
case RID_SETOPERATIONS_CAT: nLines = 5; break;
case RID_FUNCTIONS_CAT: nLines = 5; break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - starmath/source
starmath/source/toolbox.cxx | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
New commits:
commit b530338b6f4b1cdd8aed2d431ee5df0fa418bba3
Author: Matthias Seidel
AuthorDate: Sun May 5 12:49:15 2019 +
Commit: Matthias Seidel
CommitDate: Sun May 5 12:49:15 2019 +
Enable forgotten 5th line for math toolbox
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index fc630a67999f..bcbfa00b8f67 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -248,7 +248,7 @@ void SmToolBoxWindow::StateChanged( StateChangedType
nStateChange )
AdjustPosSize( bSetPosition );
bSetPosition = sal_False;
}
-//... otherwise the base class will remember the last position of the
window
+// ... otherwise the base class will remember the last position of the
window
SfxFloatingWindow::StateChanged( nStateChange );
}
@@ -256,7 +256,7 @@ void SmToolBoxWindow::StateChanged( StateChangedType
nStateChange )
void SmToolBoxWindow::AdjustPosSize( sal_Bool bSetPos )
{
Size aCatSize( aToolBoxCat.CalcWindowSizePixel( 2 ) );
-Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( 4 /* see nLines in
SetCategory*/ ) );
+Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( 4 /* see nLines in
SetCategory */ ) );
DBG_ASSERT( aCatSize.Width() == aCmdSize.Width(), "width mismatch" );
// catalog settings
@@ -325,13 +325,13 @@ void SmToolBoxWindow::SetCategory(sal_uInt16 nCategoryRID)
switch (nCategoryRID)
{
case RID_UNBINOPS_CAT : nLines = 4; break;
-case RID_RELATIONS_CAT: nLines = 4; break;
-case RID_SETOPERATIONS_CAT: nLines = 4; break;
-case RID_FUNCTIONS_CAT: nLines = 4; break;
+case RID_RELATIONS_CAT: nLines = 5; break;
+case RID_SETOPERATIONS_CAT: nLines = 5; break;
+case RID_FUNCTIONS_CAT: nLines = 5; break;
case RID_OPERATORS_CAT: nLines = 3; break;
-case RID_ATTRIBUTES_CAT:nLines = 4; break;
+case RID_ATTRIBUTES_CAT:nLines = 5; break;
case RID_MISC_CAT: nLines = 4; break;
-case RID_BRACKETS_CAT: nLines = 4; break;
+case RID_BRACKETS_CAT: nLines = 5; break;
case RID_FORMAT_CAT:nLines = 3; break;
default:
// nothing to be done
@@ -397,4 +397,3 @@ SmToolBoxWrapper::SmToolBoxWrapper(Window *pParentWindow,
((SfxFloatingWindow *)pWindow)->Initialize(pInfo);
}
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - comphelper/inc
comphelper/inc/comphelper/extract.hxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit a42c158c9d46e01e32445773e157a24d42e412f6
Author: Matthias Seidel
AuthorDate: Sun May 5 00:43:53 2019 +
Commit: Matthias Seidel
CommitDate: Sun May 5 00:43:53 2019 +
Fixed typo
diff --git a/comphelper/inc/comphelper/extract.hxx
b/comphelper/inc/comphelper/extract.hxx
index 8d295832d088..88dc9cef624b 100644
--- a/comphelper/inc/comphelper/extract.hxx
+++ b/comphelper/inc/comphelper/extract.hxx
@@ -20,6 +20,7 @@
*/
+
#ifndef _COMPHELPER_EXTRACT_HXX_
#define _COMPHELPER_EXTRACT_HXX_
@@ -34,11 +35,11 @@ namespace cppu
{
/**
- * Sets enum from int32 value. This function does NOT check for valid enum
values!
+ * Sets enum from int32 value. This function does NOT check for valid enum
values!
*
* @param nEnum int32 enum value
* @param rType enum type
- * @return enum or emoty any.
+ * @return enum or empty any.
*/
inline ::com::sun::star::uno::Any SAL_CALL int2enum(
sal_Int32 nEnum, const ::com::sun::star::uno::Type & rType )
@@ -105,7 +106,7 @@ inline ::com::sun::star::uno::Any SAL_CALL enum2any( E
eEnum )
}
/**
- * Extracts interface from an any. If given any does not hold the demanded
interface,
+ * Extracts interface from an any. If given any does not hold the demanded
interface,
* it will be queried for it.
* If no interface is available, the out ref will be cleared.
*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - comphelper/inc
comphelper/inc/comphelper/embeddedobjectcontainer.hxx |9 + 1 file changed, 5 insertions(+), 4 deletions(-) New commits: commit 36ded0bc8eef88d8c19773696ec2c002895d2e96 Author: Matthias Seidel AuthorDate: Thu May 2 16:19:37 2019 + Commit: Matthias Seidel CommitDate: Thu May 2 16:19:37 2019 + Fixed typos diff --git a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx index f2682af7856b..a7d1755419db 100644 --- a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx +++ b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx @@ -20,6 +20,7 @@ */ + #ifndef _COMPHELPER_OBJECTCONTAINER_HXX_ #define _COMPHELPER_OBJECTCONTAINER_HXX_ @@ -132,7 +133,7 @@ sal_BoolRemoveEmbeddedObject( const ::rtl::OUString& rName, sal_Bool sal_BoolRemoveEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, sal_Bool bClose = sal_True, sal_Bool bKeepToTempStorage = sal_True ); // remove an embedded object from the container and from the storage; if object can't be closed //sal_BoolRemoveEmbeddedObject( const ::rtl::OUString& rName, sal_Bool bClose=sal_True ); - // sal_BoolRemoveEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, sal_Bool bClose=sal_True ); +//sal_BoolRemoveEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, sal_Bool bClose=sal_True ); // close and remove an embedded object from the container without removing it from the storage sal_BoolCloseEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ); @@ -149,7 +150,7 @@ sal_BoolRemoveEmbeddedObject( const ::com::sun::star::uno::Reference // add a graphical representation for an object sal_BoolInsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const ::rtl::OUString& rMediaType ); -// try to add a graphical representation for an object in optimized way ( might fail ) +// try to add a graphical representation for an object in optimized way (might fail) sal_BoolInsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const rtl::OUString& rMediaType ); // remove a graphical representation for an object @@ -173,8 +174,8 @@ sal_BoolRemoveEmbeddedObject( const ::com::sun::star::uno::Reference /** call setPersistentEntry for each embedded object in the container * -* \param _xStorage The storeage where to store the objects. -* \param _bClearModifedFlag If then the modifed flag will be set to otherwise nothing happen. +* \param _xStorage The storage where to store the objects. +* \param _bClearModifedFlag If then the modified flag will be set to otherwise nothing happen. * \return if no error occurred, otherwise . */ sal_Bool SetPersistentEntries(const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& _xStorage,bool _bClearModifedFlag = true); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - comphelper/inc udkapi/com
comphelper/inc/comphelper/namedvaluecollection.hxx |4 ++-- udkapi/com/sun/star/container/XNamedEx.idl |1 + 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 229623ec69f002e75afc07229dab85ca760c7c92 Author: Matthias Seidel AuthorDate: Thu May 2 00:24:03 2019 + Commit: Matthias Seidel CommitDate: Thu May 2 00:24:03 2019 + Fixed typos diff --git a/comphelper/inc/comphelper/namedvaluecollection.hxx b/comphelper/inc/comphelper/namedvaluecollection.hxx index d22446b8eaf1..6c1c3a60675d 100644 --- a/comphelper/inc/comphelper/namedvaluecollection.hxx +++ b/comphelper/inc/comphelper/namedvaluecollection.hxx @@ -158,7 +158,7 @@ namespace comphelper @return if there is a value with the given name, which could successfully -be extraced. In this case, _out_rValue will contain the requested +be extracted. In this case, _out_rValue will contain the requested value. , if there is no value with the given name. @throws IllegalArgumentException @@ -178,7 +178,7 @@ namespace comphelper } /** retrieves a value with a given name, or defaults it to a given value, if its not present -in the colllection +in the collection */ template < typename VALUE_TYPE > VALUE_TYPE getOrDefault( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rDefault ) const commit 05da77c638dd0f190c362a7a00fd0192e79fe6d5 Author: Matthias Seidel AuthorDate: Thu May 2 00:06:33 2019 + Commit: Matthias Seidel CommitDate: Thu May 2 00:06:33 2019 + Added missing #endif diff --git a/udkapi/com/sun/star/container/XNamedEx.idl b/udkapi/com/sun/star/container/XNamedEx.idl index b59c50428118..f794cafc47cb 100644 --- a/udkapi/com/sun/star/container/XNamedEx.idl +++ b/udkapi/com/sun/star/container/XNamedEx.idl @@ -29,6 +29,7 @@ #ifndef __com_sun_star_container_XNamed_idl__ #include +#endif //= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions.lst
extensions.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1cf848bb409cd8710d11b85d0943f5e908a0b097 Author: Matthias Seidel AuthorDate: Wed May 1 22:24:52 2019 + Commit: Matthias Seidel CommitDate: Wed May 1 22:24:52 2019 + Updated English dictionary 2019.05.01 diff --git a/extensions.lst b/extensions.lst index 3b08605143a5..5655e3cea1e5 100644 --- a/extensions.lst +++ b/extensions.lst @@ -73,7 +73,7 @@ # English (en_AU, en_CA, en_GB, en_US, en_ZA) dictionary [ language=en.* || language=de || language=it ] - 1e8d1fa844c4771a6ef91afe80d77c81 https://sourceforge.net/projects/aoo-extensions/files/17102/46/dict-en-20190301.oxt/download "dict-en.oxt" + 2d8cc9e3825d481283bf6f3817ac4b4e https://sourceforge.net/projects/aoo-extensions/files/17102/47/dict-en-20190501b.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - toolkit/qa
toolkit/qa/complex/toolkit/GridControl.java |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a67bf7fdcbdd808a9b3eebf13d9a1a1084d3be2f
Author: Matthias Seidel
AuthorDate: Tue Apr 30 18:07:54 2019 +
Commit: Matthias Seidel
CommitDate: Tue Apr 30 18:07:54 2019 +
Fixed typos
diff --git a/toolkit/qa/complex/toolkit/GridControl.java
b/toolkit/qa/complex/toolkit/GridControl.java
index 05440a5d9672..09efeb032008 100644
--- a/toolkit/qa/complex/toolkit/GridControl.java
+++ b/toolkit/qa/complex/toolkit/GridControl.java
@@ -128,7 +128,7 @@ public class GridControl
// TODO: check all those generic properties for equality
// the data model and the column model should have been cloned, too
-// in particular, the clone should not share the sub models with the
orignal
+// in particular, the clone should not share the sub models with the
original
final XMutableGridDataModel originalDataModel =
UnoRuntime.queryInterface( XMutableGridDataModel.class,
m_gridControlModel.getPropertyValue( "GridDataModel" ) );
final XMutableGridDataModel clonedDataModel =
UnoRuntime.queryInterface( XMutableGridDataModel.class,
@@ -214,7 +214,7 @@ public class GridControl
test.testUpdateRowHeading();
test.cleanup();
-// a somehwat less straight-forward test: the data model is expected
to implicitly increase its column count
+// a somewhat less straight-forward test: the data model is expected
to implicitly increase its column count
// when you add a row which has more columns than currently known
final XMutableGridDataModel dataModel = DefaultGridDataModel.create(
m_context );
dataModel.addRow( 0, new Object[] { 1 } );
@@ -302,7 +302,7 @@ public class GridControl
removeColumnIndex, removalIndex );
}
-// calling addColumn with a column not created by the given
model/implementatoion should not succeed
+// calling addColumn with a column not created by the given
model/implementation should not succeed
boolean caughtExpected = false;
try
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - l10ntools/inc
l10ntools/inc/tagtest.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 709c31bed08670e1949c04bc0e5cf79bbcbcd91e Author: Matthias Seidel AuthorDate: Mon Apr 29 20:12:26 2019 + Commit: Matthias Seidel CommitDate: Mon Apr 29 20:12:26 2019 + Fixed typos diff --git a/l10ntools/inc/tagtest.hxx b/l10ntools/inc/tagtest.hxx index 9d0e14ae9223..241a6a7837c1 100644 --- a/l10ntools/inc/tagtest.hxx +++ b/l10ntools/inc/tagtest.hxx @@ -105,7 +105,7 @@ explicitTokenInfo( TokenId pnId, sal_uInt16 nP, String paStr, ParserMessageL sal_Bool IsPropertyInvariant( const ByteString , const String ) const; /** a subset of IsPropertyInvariant but containing only those that are fixable -we dont wat to fix e.g.: ahelp :: visibility +we don't want to fix e.g.: ahelp :: visibility **/ sal_Bool IsPropertyFixable( const ByteString ) const; sal_Bool MatchesTranslation( TokenInfo& rInfo, sal_Bool bGenErrors, ParserMessageList , sal_Bool bFixTags = sal_False ) const; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - vcl/inc
vcl/inc/unx/x11_cursors/ase_mask.h |1 +
vcl/inc/unx/x11_cursors/null_curs.h | 10 +-
vcl/inc/unx/x11_cursors/null_mask.h | 10 +-
3 files changed, 11 insertions(+), 10 deletions(-)
New commits:
commit 22838948d7f1682bc8f892ba02c489edd617f269
Author: Matthias Seidel
AuthorDate: Mon Apr 29 15:55:38 2019 +
Commit: Matthias Seidel
CommitDate: Mon Apr 29 15:55:38 2019 +
Fixed error introduced in my last commit.
diff --git a/vcl/inc/unx/x11_cursors/null_curs.h
b/vcl/inc/unx/x11_cursors/null_curs.h
index f99e0543e691..13ed507f74c6 100644
--- a/vcl/inc/unx/x11_cursors/null_curs.h
+++ b/vcl/inc/unx/x11_cursors/null_curs.h
@@ -20,9 +20,9 @@
*/
-#define null_curs_width 4
-#define null_curs_height 4
-#define null_curs_x_hot 2
-#define null_curs_y_hot 2
+#define nullcurs_width 4
+#define nullcurs_height 4
+#define nullcurs_x_hot 2
+#define nullcurs_y_hot 2
-static const unsigned char null_curs_bits[] = {0x00,0x00};
+static const unsigned char nullcurs_bits[] = {0x00,0x00};
diff --git a/vcl/inc/unx/x11_cursors/null_mask.h
b/vcl/inc/unx/x11_cursors/null_mask.h
index ea648d54026f..5e4d6841e104 100644
--- a/vcl/inc/unx/x11_cursors/null_mask.h
+++ b/vcl/inc/unx/x11_cursors/null_mask.h
@@ -20,9 +20,9 @@
*/
-#define null_mask_width 4
-#define null_mask_height 4
-#define null_mask_x_hot 2
-#define null_mask_y_hot 2
+#define nullmask_width 4
+#define nullmask_height 4
+#define nullmask_x_hot 2
+#define nullmask_y_hot 2
-static const unsigned char null_mask_bits[] = {0x00,0x00};
+static const unsigned char nullmask_bits[] = {0x00,0x00};
commit 9ac6e891a23c99f06794473e43d24ddc3ce9a3a6
Author: Matthias Seidel
AuthorDate: Mon Apr 29 15:49:19 2019 +
Commit: Matthias Seidel
CommitDate: Mon Apr 29 15:49:19 2019 +
Fixed missing line
diff --git a/vcl/inc/unx/x11_cursors/ase_mask.h
b/vcl/inc/unx/x11_cursors/ase_mask.h
index 9c2a3c2e7e63..e1610cdc983f 100644
--- a/vcl/inc/unx/x11_cursors/ase_mask.h
+++ b/vcl/inc/unx/x11_cursors/ase_mask.h
@@ -57,3 +57,4 @@ static const unsigned char ase_mask_bits[] = {
0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/inc
/drawtext_curs.h | 44 --
vcl/inc/unx/x11_cursors/drawtext_mask.h | 46 ---
vcl/inc/unx/x11_cursors/fill_curs.h | 42 --
vcl/inc/unx/x11_cursors/fill_mask.h | 42 --
vcl/inc/unx/x11_cursors/hshear_curs.h | 44 --
vcl/inc/unx/x11_cursors/hshear_mask.h | 46 ---
vcl/inc/unx/x11_cursors/invert50.h | 97
vcl/inc/unx/x11_cursors/linkdata_curs.h | 44 --
vcl/inc/unx/x11_cursors/linkdata_mask.h | 44 --
vcl/inc/unx/x11_cursors/linkfile_curs.h | 44 --
vcl/inc/unx/x11_cursors/linkfile_mask.h | 44 --
vcl/inc/unx/x11_cursors/magnify_curs.h | 42 --
vcl/inc/unx/x11_cursors/magnify_mask.h | 46 ---
vcl/inc/unx/x11_cursors/mirror_curs.h | 44 --
vcl/inc/unx/x11_cursors/mirror_mask.h | 46 ---
vcl/inc/unx/x11_cursors/movebezierweight_curs.h | 44 --
vcl/inc/unx/x11_cursors/movebezierweight_mask.h | 46 ---
vcl/inc/unx/x11_cursors/movedata_curs.h | 44 --
vcl/inc/unx/x11_cursors/movedata_mask.h | 44 --
vcl/inc/unx/x11_cursors/movedlnk_curs.h | 44 --
vcl/inc/unx/x11_cursors/movedlnk_mask.h | 44 --
vcl/inc/unx/x11_cursors/movefile_curs.h | 44 --
vcl/inc/unx/x11_cursors/movefile_mask.h | 44 --
vcl/inc/unx/x11_cursors/movefiles_curs.h| 44 --
vcl/inc/unx/x11_cursors/movefiles_mask.h| 44 --
vcl/inc/unx/x11_cursors/moveflnk_curs.h | 44 --
vcl/inc/unx/x11_cursors/moveflnk_mask.h | 44 --
vcl/inc/unx/x11_cursors/movepoint_curs.h| 44 --
vcl/inc/unx/x11_cursors/movepoint_mask.h| 46 ---
vcl/inc/unx/x11_cursors/nodrop_curs.h | 44 --
vcl/inc/unx/x11_cursors/nodrop_mask.h | 44 --
vcl/inc/unx/x11_cursors/null_curs.h | 11 +-
vcl/inc/unx/x11_cursors/null_mask.h |9 +-
vcl/inc/unx/x11_cursors/paintbrush_curs.h | 21 -
vcl/inc/unx/x11_cursors/paintbrush_mask.h | 24 -
vcl/inc/unx/x11_cursors/pivotcol_curs.h | 44 --
vcl/inc/unx/x11_cursors/pivotcol_mask.h | 44 --
vcl/inc/unx/x11_cursors/pivotdel_curs.h | 44 --
vcl/inc/unx/x11_cursors/pivotdel_mask.h | 44 --
vcl/inc/unx/x11_cursors/pivotfld_curs.h | 44 --
vcl/inc/unx/x11_cursors/pivotfld_mask.h | 44 --
vcl/inc/unx/x11_cursors/pivotrow_curs.h | 44 --
vcl/inc/unx/x11_cursors/pivotrow_mask.h | 44 --
vcl/inc/unx/x11_cursors/rotate_curs.h | 44 --
vcl/inc/unx/x11_cursors/rotate_mask.h | 46 ---
vcl/inc/unx/x11_cursors/tblsele_curs.h | 21 -
vcl/inc/unx/x11_cursors/tblsele_mask.h | 24 -
vcl/inc/unx/x11_cursors/tblsels_curs.h | 22 -
vcl/inc/unx/x11_cursors/tblsels_mask.h | 24 -
vcl/inc/unx/x11_cursors/tblselse_curs.h | 21 -
vcl/inc/unx/x11_cursors/tblselse_mask.h | 24 -
vcl/inc/unx/x11_cursors/tblselsw_curs.h | 27 +-
vcl/inc/unx/x11_cursors/tblselsw_mask.h | 24 -
vcl/inc/unx/x11_cursors/tblselw_curs.h | 21 -
vcl/inc/unx/x11_cursors/tblselw_mask.h | 23 -
vcl/inc/unx/x11_cursors/timemove_curs.h | 42 --
vcl/inc/unx/x11_cursors/timemove_mask.h | 42 --
vcl/inc/unx/x11_cursors/timesize_curs.h | 42 --
vcl/inc/unx/x11_cursors/timesize_mask.h | 42 --
vcl/inc/unx/x11_cursors/vertcurs_curs.h | 21 -
vcl/inc/unx/x11_cursors/vertcurs_mask.h | 21 -
vcl/inc/unx/x11_cursors/vshear_curs.h | 44 --
vcl/inc/unx/x11_cursors/vshear_mask.h | 46 ---
137 files changed, 4355 insertions(+), 1333 deletions(-)
New commits:
commit 2d9cf355f218680b0e7d84ff553e5bb648ff321c
Author: Matthias Seidel
AuthorDate: Sat Apr 27 16:01:45 2019 +
Commit: Matthias Seidel
CommitDate: Sat Apr 27 16:01:45 2019 +
Reformated Hex-Dumps for better "readability"
diff --git a/vcl/inc/unx/x11_cursors/airbrush_curs.h
b/vcl/inc/unx/x11_cursors/airbrush_curs.h
index 8aa784036e5d..83b7dc2896a5 100644
--- a/vcl/inc/unx/x11_cursors/airbrush_curs.h
+++ b/vcl/inc/unx/x11_cursors/airbrush_curs.h
@@ -24,13 +24,37 @@
#define airbrush_curs_height 32
#define airbrush_curs_x_hot 5
#define airbrush_curs_y_hot 22
+
static const unsigned char airbrush_curs_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scripting/workben
scripting/workben/installer/sidebar.jpg |binary 1 file changed New commits: commit b2cdaf15f72c5f35e44ca0289e084750ebf22fbd Author: Matthias Seidel AuthorDate: Fri Apr 26 15:46:46 2019 + Commit: Matthias Seidel CommitDate: Fri Apr 26 15:46:46 2019 + Updated graphic diff --git a/scripting/workben/installer/sidebar.jpg b/scripting/workben/installer/sidebar.jpg index c2b366f74e76..b6f053fdcd71 100644 Binary files a/scripting/workben/installer/sidebar.jpg and b/scripting/workben/installer/sidebar.jpg differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scripting/workben
scripting/workben/installer/Scripting.xcs | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit 684c35380a72f81bd6a026615723b06b3e14fa6e Author: Matthias Seidel AuthorDate: Thu Apr 25 23:37:12 2019 + Commit: Matthias Seidel CommitDate: Thu Apr 25 23:37:12 2019 + Fixed typo diff --git a/scripting/workben/installer/Scripting.xcs b/scripting/workben/installer/Scripting.xcs index 3c26b83295e9..18690c2a8ee6 100644 --- a/scripting/workben/installer/Scripting.xcs +++ b/scripting/workben/installer/Scripting.xcs @@ -1,6 +1,6 @@ @@ -25,18 +25,18 @@ http://openoffice.org/2001/registry; xmlns:xs="http://www.w3.org/2001/XMLSchema; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; oor:name="Scripting" oor:package="org.openoffice.Office" xml:lang="en-US"> DF - -Contains the various settings needed by the Scripting Framework and its runtimes. + + Contains the various settings needed by the Scripting Framework and its runtimes. - - Specifies the runtimes available to the Scriptying Framework. + + Specifies the runtimes available to the Scripting Framework. - + Lists the file extensions that are recognized by this runtime. @@ -45,7 +45,7 @@ - + Lists the registered Scripting Framework runtimes. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/sfx2 default_images/svtools default_images/vcl
default_images/sfx2/res/symphony/morebutton.png |binary default_images/sfx2/res/symphony/morebutton_h.png |binary default_images/sfx2/res/symphony/open_more.png|binary default_images/svtools/res/closer.png |binary default_images/vcl/res/closedoc.png |binary 5 files changed New commits: commit 8b005725dea8f09cd4bb66b63f371f385268bdd3 Author: Matthias Seidel AuthorDate: Tue Apr 23 09:51:57 2019 + Commit: Matthias Seidel CommitDate: Tue Apr 23 09:51:57 2019 + Updated graphics for sidebar diff --git a/default_images/sfx2/res/symphony/morebutton.png b/default_images/sfx2/res/symphony/morebutton.png index 5cffa97ca41c..c01e480a8c4c 100644 Binary files a/default_images/sfx2/res/symphony/morebutton.png and b/default_images/sfx2/res/symphony/morebutton.png differ diff --git a/default_images/sfx2/res/symphony/morebutton_h.png b/default_images/sfx2/res/symphony/morebutton_h.png index 5cffa97ca41c..a1681fedbcdc 100644 Binary files a/default_images/sfx2/res/symphony/morebutton_h.png and b/default_images/sfx2/res/symphony/morebutton_h.png differ diff --git a/default_images/sfx2/res/symphony/open_more.png b/default_images/sfx2/res/symphony/open_more.png index c981abf0f3a5..6cc812765063 100644 Binary files a/default_images/sfx2/res/symphony/open_more.png and b/default_images/sfx2/res/symphony/open_more.png differ diff --git a/default_images/svtools/res/closer.png b/default_images/svtools/res/closer.png index 410982a21b05..875b59190e6b 100644 Binary files a/default_images/svtools/res/closer.png and b/default_images/svtools/res/closer.png differ diff --git a/default_images/vcl/res/closedoc.png b/default_images/vcl/res/closedoc.png index 410982a21b05..875b59190e6b 100644 Binary files a/default_images/vcl/res/closedoc.png and b/default_images/vcl/res/closedoc.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - avmedia/source default_images/sfx2
avmedia/source/framework/mediacontrol.hrc |1
avmedia/source/framework/mediacontrol.src | 92 +++---
avmedia/source/viewer/mediawindow.src | 16 ++---
default_images/sfx2/res/closedoc.png |binary
4 files changed, 58 insertions(+), 51 deletions(-)
New commits:
commit af6fe636711841e1ebe22d7aa0c5a3712e5dcb09
Author: Matthias Seidel
AuthorDate: Sun Apr 21 10:16:51 2019 +
Commit: Matthias Seidel
CommitDate: Sun Apr 21 10:16:51 2019 +
Updated graphic
diff --git a/default_images/sfx2/res/closedoc.png
b/default_images/sfx2/res/closedoc.png
index 410982a21b05..875b59190e6b 100644
Binary files a/default_images/sfx2/res/closedoc.png and
b/default_images/sfx2/res/closedoc.png differ
commit 4820583166d892919fad9efea65288915fac1526
Author: Matthias Seidel
AuthorDate: Sun Apr 21 10:16:02 2019 +
Commit: Matthias Seidel
CommitDate: Sun Apr 21 10:16:02 2019 +
Cleaned up files for media controls, re-added entries for maskcolor
diff --git a/avmedia/source/framework/mediacontrol.hrc
b/avmedia/source/framework/mediacontrol.hrc
index 6cd2a18d04cc..efbe71bf1891 100644
--- a/avmedia/source/framework/mediacontrol.hrc
+++ b/avmedia/source/framework/mediacontrol.hrc
@@ -47,3 +47,4 @@
#define AVMEDIA_IMGLST_HC 3073
#define AVMEDIA_IMGLST_L3074
#define AVMEDIA_IMGLST_L_HC 3075
+
diff --git a/avmedia/source/framework/mediacontrol.src
b/avmedia/source/framework/mediacontrol.src
index 4074be8d2a3b..43c8b72c2368 100644
--- a/avmedia/source/framework/mediacontrol.src
+++ b/avmedia/source/framework/mediacontrol.src
@@ -25,7 +25,7 @@
String AVMEDIA_STR_OPEN
{
-Text [en-US] = "Open" ;
+Text [ en-US ] = "Open" ;
};
//
--
@@ -39,77 +39,77 @@ String AVMEDIA_STR_INSERT
String AVMEDIA_STR_PLAY
{
-Text [en-US] = "Play" ;
+Text [ en-US ] = "Play" ;
};
//
--
String AVMEDIA_STR_PAUSE
{
-Text [en-US] = "Pause" ;
+Text [ en-US ] = "Pause" ;
};
//
--
String AVMEDIA_STR_STOP
{
-Text [en-US] = "Stop" ;
+Text [ en-US ] = "Stop" ;
};
//
--
String AVMEDIA_STR_ENDLESS
{
-Text [en-US] = "Repeat" ;
+Text [ en-US ] = "Repeat" ;
};
//
--
String AVMEDIA_STR_MUTE
{
-Text [en-US] = "Mute" ;
+Text [ en-US ] = "Mute" ;
};
//
--
String AVMEDIA_STR_ZOOM
{
-Text [en-US] = "View" ;
+Text [ en-US ] = "View" ;
};
//
--
String AVMEDIA_STR_ZOOM_50
{
-Text [en-US] = "50 %" ;
+Text [ en-US ] = "50 %" ;
};
//
--
String AVMEDIA_STR_ZOOM_100
{
-Text [en-US] = "100 %" ;
+Text [ en-US ] = "100 %" ;
};
//
--
String AVMEDIA_STR_ZOOM_200
{
-Text [en-US] = "200 %" ;
+Text [ en-US ] = "200 %" ;
};
//
--
String AVMEDIA_STR_ZOOM_FIT
{
-Text [en-US] = "Scaled" ;
+Text [ en-US ] = "Scaled" ;
};
//
--
String AVMEDIA_STR_MEDIAPLAYER
{
-Text [en-US] = "Media Player" ;
+Text [ en-US ] = "Media Player" ;
};
//
--
@@ -117,17 +117,18 @@ String AVMEDIA_STR_MEDIAPLAYER
ImageList AVMEDIA_IMGLST
{
Prefix = "av" ;
+MaskColor = Color{ Red = 0xff00; Green = 0x; Blue = 0xff00; };
IdList =
{
-AVMEDIA_IMG_OPEN;
-AVMEDIA_IMG_PLAY;
-AVMEDIA_IMG_PAUSE;
-AVMEDIA_IMG_STOP;
-AVMEDIA_IMG_ENDLESS;
-AVMEDIA_IMG_INSERT;
-AVMEDIA_IMG_MUTE;
+AVMEDIA_IMG_OPEN ;
+AVMEDIA_IMG_PLAY ;
+AVMEDIA_IMG_PAUSE ;
+AVMEDIA_IMG_STOP ;
+AVMEDIA_IMG_ENDLESS ;
+AVMEDIA_IMG_INSERT ;
+AVMEDIA_IMG_MUTE ;
};
-IdCount = 7;
+IdCount = 7 ;
};
//
--
@@ -135,17 +136,18 @@ ImageList AVMEDIA_IMGLST
ImageList AVMEDIA_IMGLST_L
{
Prefix = "avl" ;
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - avmedia/source default_images/avmedia
avmedia/source/framework/mediacontrol.src | 38 ++
default_images/avmedia/res/avlh02053.png |binary
default_images/avmedia/res/avlh02054.png |binary
3 files changed, 18 insertions(+), 20 deletions(-)
New commits:
commit 00c49664c07ebdf242a957f6f83446c6bb0d08a4
Author: Matthias Seidel
AuthorDate: Sat Apr 20 16:30:51 2019 +
Commit: Matthias Seidel
CommitDate: Sat Apr 20 16:30:51 2019 +
Cleaned up resource file for media controls, removed entries for maskcolor
diff --git a/avmedia/source/framework/mediacontrol.src
b/avmedia/source/framework/mediacontrol.src
index 91f166da8ed8..4074be8d2a3b 100644
--- a/avmedia/source/framework/mediacontrol.src
+++ b/avmedia/source/framework/mediacontrol.src
@@ -25,7 +25,7 @@
String AVMEDIA_STR_OPEN
{
-Text[en-US] = "Open";
+Text [en-US] = "Open" ;
};
//
--
@@ -39,85 +39,84 @@ String AVMEDIA_STR_INSERT
String AVMEDIA_STR_PLAY
{
-Text[en-US] = "Play";
+Text [en-US] = "Play" ;
};
//
--
String AVMEDIA_STR_PAUSE
{
-Text[en-US] = "Pause";
+Text [en-US] = "Pause" ;
};
//
--
String AVMEDIA_STR_STOP
{
-Text[en-US] = "Stop";
+Text [en-US] = "Stop" ;
};
//
--
String AVMEDIA_STR_ENDLESS
{
-Text[en-US] = "Repeat";
+Text [en-US] = "Repeat" ;
};
//
--
String AVMEDIA_STR_MUTE
{
-Text[en-US] = "Mute";
+Text [en-US] = "Mute" ;
};
//
--
String AVMEDIA_STR_ZOOM
{
-Text[en-US] = "View";
+Text [en-US] = "View" ;
};
//
--
String AVMEDIA_STR_ZOOM_50
{
-Text[en-US] = "50 %";
+Text [en-US] = "50 %" ;
};
//
--
String AVMEDIA_STR_ZOOM_100
{
-Text[en-US] = "100 %";
+Text [en-US] = "100 %" ;
};
//
--
String AVMEDIA_STR_ZOOM_200
{
-Text[en-US] = "200 %";
+Text [en-US] = "200 %" ;
};
//
--
String AVMEDIA_STR_ZOOM_FIT
{
-Text[en-US] = "Scaled";
+Text [en-US] = "Scaled" ;
};
//
--
String AVMEDIA_STR_MEDIAPLAYER
{
-Text[en-US] = "Media Player";
+Text [en-US] = "Media Player" ;
};
//
--
ImageList AVMEDIA_IMGLST
{
-Prefix = "av";
-MaskColor = Color{ Red = 0xff00; Green = 0x; Blue = 0xff00; };
+Prefix = "av" ;
IdList =
{
AVMEDIA_IMG_OPEN;
@@ -135,8 +134,7 @@ ImageList AVMEDIA_IMGLST
ImageList AVMEDIA_IMGLST_L
{
-Prefix = "avl";
-MaskColor = Color{ Red = 0xff00; Green = 0x; Blue = 0xff00; };
+Prefix = "avl" ;
IdList =
{
AVMEDIA_IMG_OPEN;
@@ -154,8 +152,7 @@ ImageList AVMEDIA_IMGLST_L
ImageList AVMEDIA_IMGLST_HC
{
-Prefix = "avh";
-MaskColor = Color{ Red = 0xff00; Green = 0x; Blue = 0xff00; };
+Prefix = "avh" ;
IdList =
{
AVMEDIA_IMG_OPEN;
@@ -173,8 +170,7 @@ ImageList AVMEDIA_IMGLST_HC
ImageList AVMEDIA_IMGLST_L_HC
{
-Prefix = "avlh";
-MaskColor = Color{ Red = 0xff00; Green = 0x; Blue = 0xff00; };
+Prefix = "avlh" ;
IdList =
{
AVMEDIA_IMG_OPEN;
@@ -187,3 +183,5 @@ ImageList AVMEDIA_IMGLST_L_HC
};
IdCount = 7;
};
+
+// ** EOF
commit 99ff40a4a156daf370ec931a83097a8d03143053
Author: Matthias Seidel
AuthorDate: Sat Apr 20 16:08:44 2019 +
Commit: Matthias Seidel
CommitDate: Sat Apr 20 16:08:44 2019 +
Converted remaining AV graphics from indexed color to RGB
diff --git a/default_images/avmedia/res/avlh02053.png
b/default_images/avmedia/res/avlh02053.png
index da66f475f95b..6070bed34859 100644
Binary files a/default_images/avmedia/res/avlh02053.png and
b/default_images/avmedia/res/avlh02053.png differ
diff --git a/default_images/avmedia/res/avlh02054.png
b/default_images/avmedia/res/avlh0
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - dbaccess/source
dbaccess/source/ui/dlg/dbadminsetup.src | 367 +++-
1 file changed, 180 insertions(+), 187 deletions(-)
New commits:
commit 98e7de2b1f23083332ac13245d81cff69d097fd6
Author: Matthias Seidel
AuthorDate: Sun Apr 14 00:34:02 2019 +
Commit: Matthias Seidel
CommitDate: Sun Apr 14 00:34:02 2019 +
Cleaned up resource file, fixed typo, removed whitespace
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src
b/dbaccess/source/ui/dlg/dbadminsetup.src
index 206435c0fa8b..461c21831cdd 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -42,332 +42,330 @@
ModalDialog DLG_DATABASE_WIZARD
{
OutputSize = TRUE ;
-Moveable = TRUE;
+Moveable = TRUE ;
Closeable = TRUE ;
-HelpId = HID_DLG_DATABASE_WIZARD;
-Hide = TRUE;
-Text[ en-US ] = "Database Wizard" ;
+HelpId = HID_DLG_DATABASE_WIZARD ;
+Hide = TRUE ;
+Text [ en-US ] = "Database Wizard" ;
TabControl 1
{
OutputSize = TRUE ;
-HelpId = HID_DSADMIN_TABCONTROL;
+HelpId = HID_DSADMIN_TABCONTROL ;
};
String STR_DBWIZARDTITLE
{
-Text[ en-US ] = "Database Wizard" ;
+Text [ en-US ] = "Database Wizard" ;
};
String STR_PAGETITLE_INTROPAGE
{
-Text[ en-US ] = "Select database" ;
+Text [ en-US ] = "Select database" ;
};
String STR_PAGETITLE_DBASE
{
-Text[ en-US ] = "Set up dBASE connection" ;
+Text [ en-US ] = "Set up dBASE connection" ;
};
String STR_PAGETITLE_TEXT
{
-Text[ en-US ] = "Set up a connection to text files" ;
+Text [ en-US ] = "Set up a connection to text files" ;
};
String STR_PAGETITLE_MSACCESS
{
-Text[ en-US ] = "Set up Microsoft Access connection" ;
+Text [ en-US ] = "Set up Microsoft Access connection" ;
};
String STR_PAGETITLE_LDAP
{
-Text[ en-US ] = "Set up LDAP connection" ;
+Text [ en-US ] = "Set up LDAP connection" ;
};
String STR_PAGETITLE_ADABAS
{
-Text[ en-US ] = "Set up Adabas D connection" ;
+Text [ en-US ] = "Set up Adabas D connection" ;
};
String STR_PAGETITLE_ADO
{
-Text[ en-US ] = "Set up ADO connection" ;
+Text [ en-US ] = "Set up ADO connection" ;
};
String STR_PAGETITLE_JDBC
{
-Text[ en-US ] = "Set up JDBC connection" ;
+Text [ en-US ] = "Set up JDBC connection" ;
};
String STR_PAGETITLE_ORACLE
{
-Text[ en-US ] = "Set up Oracle database connection" ;
+Text [ en-US ] = "Set up Oracle database connection" ;
};
String STR_PAGETITLE_MYSQL
{
-Text[ en-US ] = "Set up MySQL connection" ;
+Text [ en-US ] = "Set up MySQL connection" ;
};
String STR_PAGETITLE_ODBC
{
-Text[ en-US ] = "Set up ODBC connection" ;
+Text [ en-US ] = "Set up ODBC connection" ;
};
String STR_PAGETITLE_SPREADSHEET
{
-Text[ en-US ] = "Set up Spreadsheet connection" ;
+Text [ en-US ] = "Set up Spreadsheet connection" ;
};
String STR_PAGETITLE_AUTHENTIFICATION
{
-Text[ en-US ] = "Set up user authentication" ;
+Text [ en-US ] = "Set up user authentication" ;
};
String STR_PAGETITLE_MYSQL_NATIVE
{
-Text [ en-US ] = "Set up MySQL server data";
+Text [ en-US ] = "Set up MySQL server data" ;
};
String STR_PAGETITLE_FINAL
{
-Text[ en-US ] = "Save and proceed" ;
+Text [ en-US ] = "Save and proceed" ;
};
};
String STR_DATABASEDEFAULTNAME
{
-Text[ en-US ] = "New Database" ;
+Text [ en-US ] = "New Database" ;
};
TabPage PAGE_DBWIZARD_MYSQL_INTRO
{
-HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MYSQL_INTRO";
+HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MYSQL_INTRO" ;
SVLook = TRUE ;
-Pos = MAP_APPFONT ( 0 , 0 ) ;
-Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
+Pos = MAP_APPFONT ( 0, 0 ) ;
+Size = MAP_APPFONT ( WIZARD_PAGE_X, WIZARD_PAGE_Y ) ;
Hide = TRUE ;
FixedText FT_MYSQL_HEADERTEXT
{
-Pos = MAP_APPFONT ( START_X , 8 ) ;
-Size = MAP_APPFONT ( (WIZARD_PAGE_X - START_X) - 12 , 2 *
FIXEDTEXT_HEIGHT ) ;
-Text[ en-US ] = "Set up a connection to a MySQL database";
-WordBreak = TRUE;
+Pos = MAP_APPFONT ( START_X, 8 ) ;
+Size = MAP_APPFONT ( (WIZARD_PAGE_X - START_X) - 12, 2 *
FIXEDTEXT_
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - README
README |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2b61e66768284b8aa775425e2cbac4f7ef62a137 Author: Matthias Seidel AuthorDate: Thu Apr 11 09:07:12 2019 + Commit: Matthias Seidel CommitDate: Thu Apr 11 09:07:12 2019 + Updated download number to 270 million. diff --git a/README b/README index 79790f58837b..a35686a78ea6 100644 --- a/README +++ b/README @@ -19,7 +19,7 @@ Apache OpenOffice (AOO) FreeBSD OS/2 -OpenOffice is used by millions of users worldwide and with more than 260 million +OpenOffice is used by millions of users worldwide and with more than 270 million downloads it is one of the most successful open source projects. Getting the latest sources via Subversion ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source
svx/source/src/errtxt.src | 25 -
1 file changed, 12 insertions(+), 13 deletions(-)
New commits:
commit a502c1af0c545bdaf6a0eb8ecbf38c635ff6accb
Author: Matthias Seidel
AuthorDate: Tue Apr 9 19:43:36 2019 +
Commit: Matthias Seidel
CommitDate: Tue Apr 9 19:43:36 2019 +
Cleaned up resource file, fixed typo, removed whitespace
diff --git a/svx/source/src/errtxt.src b/svx/source/src/errtxt.src
index d08dc8e4d169..afef54975f14 100644
--- a/svx/source/src/errtxt.src
+++ b/svx/source/src/errtxt.src
@@ -42,11 +42,11 @@ Resource RID_ERRCTX
};
String ERRCTX_SFX_SAVEDOC
{
-Text [ en-US ] = "$(ERR) saving the document $(ARG1)";
+Text [ en-US ] = "$(ERR) saving the document $(ARG1)" ;
};
String ERRCTX_SFX_SAVEASDOC
{
-Text [ en-US ] = "$(ERR) saving the document $(ARG1)";
+Text [ en-US ] = "$(ERR) saving the document $(ARG1)" ;
};
String ERRCTX_SFX_DOCINFO
{
@@ -86,7 +86,7 @@ Resource RID_ERRCTX
};
String ERRCTX_SFX_SEARCHADDRESS
{
-Text [ en-US ] = "$(ERR) searching for an address";
+Text [ en-US ] = "$(ERR) searching for an address" ;
};
};
Resource RID_ERRHDL
@@ -341,7 +341,7 @@ Resource RID_ERRHDL
};
String ERRCODE_INET_OFFLINE
{
-Text [ en-US ] = "The requested Internet data is not available in the
cache and cannot be transmitted as the Online mode has not be activated." ;
+Text [ en-US ] = "The requested Internet data is not available in the
cache and cannot be transmitted as the Online mode has not been activated." ;
};
String ERRCODE_SFXMSG_STYLEREPLACE
{
@@ -446,15 +446,15 @@ Resource RID_ERRHDL
};
String ERRCODE_IO_NOTSTORABLEINBINARYFORMAT
{
-Text [ en-US ] = "This document contains attributes that cannot be
saved in the selected format.\nPlease save the document in a %PRODUCTNAME
%PRODUCTVERSION file format.";
+Text [ en-US ] = "This document contains attributes that cannot be
saved in the selected format.\nPlease save the document in a %PRODUCTNAME
%PRODUCTVERSION file format." ;
};
String ERRCODE_SFX_TARGETFILECORRUPTED
{
-Text [ en-US ] = "The file $(FILENAME) cannot be saved. Please check
your system settings. You can find an automatically generated backup copy of
this file in folder $(PATH) named $(BACKUPNAME).";
+Text [ en-US ] = "The file $(FILENAME) cannot be saved. Please check
your system settings. You can find an automatically generated backup copy of
this file in folder $(PATH) named $(BACKUPNAME)." ;
};
String ERRCODE_SFX_NOMOREDOCUMENTSALLOWED
{
-Text [ en-US ] = "The maximum number of documents that can be opened
at the same time has been reached. You need to close one or more documents
before you can open a new document.";
+Text [ en-US ] = "The maximum number of documents that can be opened
at the same time has been reached. You need to close one or more documents
before you can open a new document." ;
};
String ERRCODE_SFX_CANTCREATEBACKUP
{
@@ -462,7 +462,7 @@ Resource RID_ERRHDL
};
String ERRCODE_SFX_MACROS_SUPPORT_DISABLED
{
-Text [ en-US ] = "An attempt was made to execute a macro.\nFor
security reasons, macro support is disabled.";
+Text [ en-US ] = "An attempt was made to execute a macro.\nFor
security reasons, macro support is disabled." ;
};
String ERRCODE_SFX_DOCUMENT_MACRO_DISABLED
{
@@ -470,11 +470,11 @@ Resource RID_ERRHDL
};
String ERRCODE_SFX_BROKENSIGNATURE
{
-Text [ en-US ] = "The digitally signed document content and/or macros
do not match the current document signature.\n\nThis could be the result of
document manipulation or of structural document damage due to data
transmission.\n\nWe recommend that you do not trust the content of the current
document.\nExecution of macros is disabled for this document.\n " ;
+Text [ en-US ] = "The digitally signed document content and/or macros
do not match the current document signature.\n\nThis could be the result of
document manipulation or of structural document damage due to data
transmission.\n\nWe recommend that you do not trust the content of the current
document.\nExecution of macros is disabled for this document.\n" ;
};
String ERRCODE_SFX_INCOMPLETE_ENCRYPTION
{
-Text [ en-US ] = "The encrypted document contains unexpected
non-encrypted streams.\n\nThis could be the result of document
manipulation.\n\nWe recommend that you do not trust the content of the current
document.\nExecution of macros is disabled for this document.\n " ;
+Text [ en-US ] = "The encrypted document contains une
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin
solenv/bin/modules/installer/download.pm | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 09162b7d8d9afdbbcf03273db3ffa31bf2ac1b6c
Author: Matthias Seidel
AuthorDate: Tue Apr 9 12:21:23 2019 +
Commit: Matthias Seidel
CommitDate: Tue Apr 9 12:21:23 2019 +
Changed download name for Dev build (according to openoffice.lst), removed
whitespace
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index 7142f69df2d0..f85777bb52a8 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -70,7 +70,7 @@ sub put_linenumber_into_script
{
my ( $scriptfile ) = @_;
-my $linenumber = $#{$scriptfile} + 2;
+my $linenumber = $#{$scriptfile} + 2;
$installer::logger::Lang->printf("Adding linenumber %d into download shell
script\n", $linenumber);
@@ -469,15 +469,15 @@ sub get_downloadname_productname
}
}
-if ( $allvariables->{'PRODUCTNAME'} eq "AOO-Developer-Build" )
+if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice Developer Build" )
{
if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
{
-$start .= "-Dev-SDK";
+$start .= "_Dev-SDK";
}
else
{
-$start .= "-Dev";
+$start .= "_Dev";
}
}
@@ -507,7 +507,7 @@ sub get_download_version
# the environment variable CWS_WORK_STAMP is set only in CWS
if ( $ENV{'CWS_WORK_STAMP'} ) { $cwsproduct = 1; }
-if (( $cwsproduct ) || ( $devproduct )) # use "DEV300m75"
+if (( $cwsproduct ) || ( $devproduct )) # use "DEV300m75"
{
my $source = uc($installer::globals::build); # DEV300
my $localminor = "";
@@ -515,7 +515,7 @@ sub get_download_version
else { $localminor = $installer::globals::lastminor; }
$version = $source . $localminor;
}
-else # use 3.2.0rc1
+else # use 3.2.0rc1
{
$version = $allvariables->{'PRODUCTVERSION'};
if (( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ) && (
$allvariables->{'ABOUTBOXPRODUCTVERSION'} ne "" )) { $version =
$allvariables->{'ABOUTBOXPRODUCTVERSION'}; }
@@ -1403,7 +1403,7 @@ sub replace_identifier_in_nshfile
{
my $oldstring = $1;
${$nshfile}[$i] =~ s/\Q$oldstring\E/$newstring/;
-$installer::logger::Lang->printf("NSIS replacement in %s (%s):
\-\> %s\n",
+$installer::logger::Lang->printf("NSIS replacement in %s (%s):
\-\> %s\n",
$nshfilename,
$onelanguage,
$oldstring,
@@ -1512,7 +1512,7 @@ sub convert_utf8_to_utf16
installer::systemactions::copy_one_file($filename, $savfilename);
open( IN, "<:utf8", $filename ) || installer::exiter::exit_program("ERROR:
Cannot open file $filename for reading", "convert_utf8_to_utf16");
-while (my $line = )
+while (my $line = )
{
push @localfile, $line;
}
@@ -1893,7 +1893,7 @@ sub create_download_sets
if ($$scriptref eq "") { installer::exiter::exit_program("ERROR:
Could not find script file $scriptfilename!", "create_download_sets"); }
my $scriptfile = installer::files::read_file($$scriptref);
-$installer::logger::Lang->printf("Found script file %s: %s \n",
$scriptfilename, $$scriptref);
+$installer::logger::Lang->printf("Found script file %s: %s \n",
$scriptfilename, $$scriptref);
# add product name into script template
put_productname_into_script($scriptfile, $allvariableshashref);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - rsc/inc
rsc/inc/vclrsc.hxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 000b773ed335eba0c99feddb037140d761e393ca
Author: Matthias Seidel
AuthorDate: Sat Mar 30 12:52:54 2019 +
Commit: Matthias Seidel
CommitDate: Sat Mar 30 12:52:54 2019 +
Minor cleanup, translated German comments
diff --git a/rsc/inc/vclrsc.hxx b/rsc/inc/vclrsc.hxx
index ac387544fa85..af3ac717c3d7 100644
--- a/rsc/inc/vclrsc.hxx
+++ b/rsc/inc/vclrsc.hxx
@@ -46,7 +46,7 @@ enum TimeFieldFormat {TIMEF_NONE, TIMEF_SEC, TIMEF_100TH_SEC,
TIMEF_SEC_CS, Time
#define KEY_CODE((sal_uInt16)0x0FFF)
-// Modifier-Tasten
+// Modifier-Keys
#define KEY_SHIFT ((sal_uInt16)0x1000)
#define KEY_MOD1((sal_uInt16)0x2000)
#define KEY_MOD2((sal_uInt16)0x4000)
@@ -69,9 +69,9 @@ enum KeyFuncType { KEYFUNC_DONTKNOW, KEYFUNC_NEW,
KEYFUNC_OPEN, KEYFUNC_SAVE,
#endif
-// --
-// - Bits fuer ToolBoxItems -
-// --
+// -
+// - Bits for ToolBoxItems -
+// -
// from vcl/inc/toolbox.hxx
typedef sal_uInt16 ToolBoxItemBits;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - instsetoo_native/util
instsetoo_native/util/openoffice.lst |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b8156901b37e5195aae92b1d6d6c1ec8c7439030
Author: Matthias Seidel
AuthorDate: Fri Mar 29 17:05:52 2019 +
Commit: Matthias Seidel
CommitDate: Fri Mar 29 17:05:52 2019 +
Changed include line for Dev build similar to Beta build
(hopefully fixes the missing desktop integration)
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index edf3750c60b8..1270bacb0657 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -176,7 +176,7 @@ Apache_OpenOffice_Dev
script setup_osl
downloadname
Apache_OpenOffice_Dev_{productversion}_{os}_install_{languages}
langpackdownloadname
Apache_OpenOffice_Dev_{productversion}_languagepack_{os}_install_{languages}
- include
{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+ include
{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/introabout
default_images/introabout/about.png |binary default_images/introabout/beta/about.png |binary default_images/introabout/dev/about.png |binary 3 files changed New commits: commit 77bb2e2c6b2eeacf6bd2cabf4500094fe6125bc9 Author: Matthias Seidel AuthorDate: Mon Mar 25 18:28:02 2019 + Commit: Matthias Seidel CommitDate: Mon Mar 25 18:28:02 2019 + Updated graphic for about dialog diff --git a/default_images/introabout/about.png b/default_images/introabout/about.png index 23ea20e06f09..81826d619e33 100755 Binary files a/default_images/introabout/about.png and b/default_images/introabout/about.png differ diff --git a/default_images/introabout/beta/about.png b/default_images/introabout/beta/about.png index 4c04542b0932..49b1fdd3d4bd 100755 Binary files a/default_images/introabout/beta/about.png and b/default_images/introabout/beta/about.png differ diff --git a/default_images/introabout/dev/about.png b/default_images/introabout/dev/about.png index 7a6613b9ba59..d4ea23d09f9c 100755 Binary files a/default_images/introabout/dev/about.png and b/default_images/introabout/dev/about.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extras/source
extras/source/autotext/lang/de/standard.bau |binary 1 file changed New commits: commit 2c3060ef81994a68dd930f0e2a718bd658cb866b Author: Matthias Seidel AuthorDate: Fri Mar 22 09:18:50 2019 + Commit: Matthias Seidel CommitDate: Fri Mar 22 09:18:50 2019 + Small corrections to German AutoText diff --git a/extras/source/autotext/lang/de/standard.bau b/extras/source/autotext/lang/de/standard.bau index 49a3c3a07467..0e6e31b2bad7 100644 Binary files a/extras/source/autotext/lang/de/standard.bau and b/extras/source/autotext/lang/de/standard.bau differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sd/source vcl/win vcl/WinResTarget_vcl.mk
dev/null |binary sd/source/filter/html/pubdlg.src |8 +- vcl/WinResTarget_vcl.mk | 10 +-- vcl/win/source/src/oo.ico|binary vcl/win/source/src/salsrc.rc | 119 +++ 5 files changed, 69 insertions(+), 68 deletions(-) New commits: commit 9353191981faed85afa7e40bd3941a8bd9d87102 Author: Matthias Seidel Date: Thu Jul 12 10:46:06 2018 + Replacing sd.ico (StarDesktop?) with OpenOffice icon diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk index e3b29b5b3540..b6c5c5ae3a6c 100755 --- a/vcl/WinResTarget_vcl.mk +++ b/vcl/WinResTarget_vcl.mk @@ -24,8 +24,8 @@ $(eval $(call gb_WinResTarget_WinResTarget,vcl/src)) $(eval $(call gb_WinResTarget_set_include,vcl/src,\ -$$(INCLUDE) \ --I$(SRCDIR)/vcl/inc \ +$$(INCLUDE) \ +-I$(SRCDIR)/vcl/inc \ )) ifeq ($(OS),WNT) @@ -49,7 +49,7 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\ vcl/win/source/src/copyf.cur \ vcl/win/source/src/drect.cur \ vcl/win/source/src/movef.cur \ -vcl/win/source/src/sd.ico \ +vcl/win/source/src/oo.ico \ vcl/win/source/src/ase.cur \ vcl/win/source/src/copyf2.cur \ vcl/win/source/src/dtext.cur \ @@ -127,8 +127,8 @@ $(eval $(call gb_WinResTarget_add_file,vcl/src,\ )) $(eval $(call gb_WinResTarget_set_include,vcl/src,\ -$$(INCLUDE) \ --I$(SRCDIR)/vcl/os2/source/src \ +$$(INCLUDE) \ +-I$(SRCDIR)/vcl/os2/source/src \ )) endif diff --git a/vcl/win/source/src/oo.ico b/vcl/win/source/src/oo.ico new file mode 100644 index ..f9c2b09e67bb Binary files /dev/null and b/vcl/win/source/src/oo.ico differ diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc index 810f15564c30..5adb26a9cb3f 100644 --- a/vcl/win/source/src/salsrc.rc +++ b/vcl/win/source/src/salsrc.rc @@ -28,67 +28,67 @@ #include #endif -SAL_RESID_POINTER_NULL CURSOR NULLPTR.CUR +SAL_RESID_POINTER_NULL CURSOR NULLPTR.CUR #if ( WINVER < 0x0400 ) -SAL_RESID_POINTER_HELP CURSOR HELP.CUR +SAL_RESID_POINTER_HELP CURSOR HELP.CUR #endif #ifndef WNT -SAL_RESID_POINTER_HSIZECURSOR HSIZE.CUR -SAL_RESID_POINTER_VSIZECURSOR VSIZE.CUR -SAL_RESID_POINTER_NESWSIZE CURSOR NESWSIZE.CUR -SAL_RESID_POINTER_NWSESIZE CURSOR NWSESIZE.CUR +SAL_RESID_POINTER_HSIZECURSOR HSIZE.CUR +SAL_RESID_POINTER_VSIZ CURSOR VSIZE.CUR +SAL_RESID_POINTER_NESWSIZE CURSOR NESWSIZE.CUR +SAL_RESID_POINTER_NWSESIZE CURSOR NWSESIZE.CUR #endif -SAL_RESID_POINTER_CROSSCURSOR CROSS.CUR -SAL_RESID_POINTER_MOVE CURSOR MOVE.CUR -SAL_RESID_POINTER_HSPLIT CURSOR HSPLIT.CUR -SAL_RESID_POINTER_VSPLIT CURSOR VSPLIT.CUR -SAL_RESID_POINTER_HSIZEBAR CURSOR HSIZEBAR.CUR -SAL_RESID_POINTER_VSIZEBAR CURSOR VSIZEBAR.CUR -SAL_RESID_POINTER_HAND CURSOR HAND.CUR -SAL_RESID_POINTER_REFHAND CURSOR REFHAND.CUR -SAL_RESID_POINTER_PEN CURSOR PEN.CUR -SAL_RESID_POINTER_MAGNIFY CURSOR MAGNIFY.CUR -SAL_RESID_POINTER_FILL CURSOR FILL.CUR -SAL_RESID_POINTER_ROTATE CURSOR ROTATE.CUR -SAL_RESID_POINTER_HSHEAR CURSOR HSHEAR.CUR -SAL_RESID_POINTER_VSHEAR CURSOR VSHEAR.CUR -SAL_RESID_POINTER_MIRROR CURSOR MIRROR.CUR -SAL_RESID_POINTER_CROOKCURSOR CROOK.CUR -SAL_RESID_POINTER_CROP CURSOR CROP.CUR -SAL_RESID_POINTER_MOVEPOINTCURSOR MOVEPT.CUR +SAL_RESID_POINTER_CROSSCURSOR CROSS.CUR +SAL_RESID_POINTER_MOVE CURSOR MOVE.CUR +SAL_RESID_POINTER_HSPLIT CURSOR HSPLIT.CUR +SAL_RESID_POINTER_VSPLIT CURSOR VSPLIT.CUR +SAL_RESID_POINTER_HSIZEBAR CURSOR HSIZEBAR.CUR +SAL_RESID_POINTER_VSIZEBAR CURSOR VSIZEBAR.CUR +SAL_RESID_POINTER_HAND CURSOR HAND.CUR +SAL_RESID_POINTER_REFHAND CURSOR REFHAND.CUR +SAL_RESID_POINTER_PEN CURSOR PEN.CUR +SAL_RESID_POINTER_MAGNIFY CURSOR MAGNIFY.CUR +SAL_RESID_POINTER_FILL CURSOR FILL.CUR +SAL_RESID_POINTER_ROTATE CURSOR ROTATE.
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - i18npool/inc
i18npool/inc/i18npool/paper.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 63c6156b7688d8e7f963b9ac9ff8bd21f39546bb
Author: Matthias Seidel
Date: Wed Jul 11 21:33:04 2018 +
Minor cleanup
diff --git a/i18npool/inc/i18npool/paper.hxx b/i18npool/inc/i18npool/paper.hxx
index 3fc3217b44f8..870b718263b2 100644
--- a/i18npool/inc/i18npool/paper.hxx
+++ b/i18npool/inc/i18npool/paper.hxx
@@ -126,8 +126,8 @@ enum Paper
class I18NPOOL_DLLPUBLIC PaperInfo
{
Paper m_eType;
-long m_nPaperWidth; // width in 100thMM
-long m_nPaperHeight;// height in 100thMM
+long m_nPaperWidth; // width in 100thMM
+long m_nPaperHeight; // height in 100thMM
public:
PaperInfo(Paper eType);
PaperInfo(long nPaperWidth, long nPaperHeight);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source
vcl/source/gdi/print.cxx | 62 +++
1 file changed, 31 insertions(+), 31 deletions(-)
New commits:
commit fcd101c81bc4f667349d3b5ba256f7b59c8c8601
Author: Matthias Seidel
Date: Wed Jul 11 19:48:07 2018 +
Minor cleanup
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 2dbfb2a2cdf1..b66cfb81b01c 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -132,16 +132,16 @@ PrinterOptions::~PrinterOptions()
{
}
-#define PROPERTYNAME_REDUCETRANSPARENCY
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceTransparency"))
-#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedTransparencyMode"))
-#define PROPERTYNAME_REDUCEGRADIENTS
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceGradients"))
-#define PROPERTYNAME_REDUCEDGRADIENTMODE
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientMode"))
-#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientStepCount"))
-#define PROPERTYNAME_REDUCEBITMAPS
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceBitmaps"))
-#define PROPERTYNAME_REDUCEDBITMAPMODE
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapMode"))
-#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapResolution"))
+#define PROPERTYNAME_REDUCETRANSPARENCY
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceTransparency"))
+#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedTransparencyMode"))
+#define PROPERTYNAME_REDUCEGRADIENTS
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceGradients"))
+#define PROPERTYNAME_REDUCEDGRADIENTMODE
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientMode"))
+#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientStepCount"))
+#define PROPERTYNAME_REDUCEBITMAPS
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceBitmaps"))
+#define PROPERTYNAME_REDUCEDBITMAPMODE
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapMode"))
+#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapResolution"))
#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapIncludesTransparency"))
-#define PROPERTYNAME_CONVERTTOGREYSCALES
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ConvertToGreyscales"))
+#define PROPERTYNAME_CONVERTTOGREYSCALES
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ConvertToGreyscales"))
bool PrinterOptions::ReadFromConfig( bool i_bFile )
{
@@ -264,7 +264,7 @@ QueueInfo::~QueueInfo()
bool QueueInfo::operator==( const QueueInfo& rInfo ) const
{
return
-maPrinterName == rInfo.maPrinterName &&
+maPrinterName == rInfo.maPrinterName &&
maDriver== rInfo.maDriver &&
maLocation == rInfo.maLocation &&
maComment == rInfo.maComment &&
@@ -426,7 +426,7 @@ const QueueInfo* Printer::GetQueueInfo( const String&
rPrinterName, bool bStatus
pInfo->mpQueueInfo->maLocation =
pInfo->mpSalQueueInfo->maLocation;
pInfo->mpQueueInfo->maComment = pInfo->mpSalQueueInfo->maComment;
pInfo->mpQueueInfo->mnStatus= pInfo->mpSalQueueInfo->mnStatus;
-pInfo->mpQueueInfo->mnJobs = pInfo->mpSalQueueInfo->mnJobs;
+pInfo->mpQueueInfo->mnJobs = pInfo->mpSalQueueInfo->mnJobs;
return pInfo->mpQueueInfo;
}
return NULL;
@@ -450,22 +450,22 @@ XubString Printer::GetDefaultPrinterName()
void Printer::ImplInitData()
{
-mbDevOutput = sal_False;
+mbDevOutput = sal_False;
meOutDevType= OUTDEV_PRINTER;
mbDefPrinter= sal_False;
-mnError = 0;
-mnCurPage = 0;
+mnError = 0;
+mnCurPage = 0;
mnCurPrintPage = 0;
mnPageQueueSize = 0;
-mnCopyCount = 1;
+mnCopyCount = 1;
mbCollateCopy = sal_False;
-mbPrinting = sal_False;
-mbJobActive = sal_False;
-mbPrintFile = sal_False;
+mbPrinting = sal_False;
+mbJobActive = sal_False;
+mbPrintFile = sal_False;
mbInPrintPage = sal_False;
mbNewJobSetup = sal_False;
mpInfoPrinter = NULL;
-mpPrinter = NULL
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source
vcl/source/src/print.src |1 - 1 file changed, 1 deletion(-) New commits: commit f6ed06e8bd5c5263d0c8e190b9a096e77deab72f Author: Matthias Seidel Date: Tue Jul 10 14:41:13 2018 + Cleaned up print dialog diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src index f457898ff828..44b344c716e3 100644 --- a/vcl/source/src/print.src +++ b/vcl/source/src/print.src @@ -539,4 +539,3 @@ StringArray RID_STR_PAPERNAMES < "B6 (JIS)"; >; }; }; - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc
solenv/inc/version.lst |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit a1dd1b5da2200e7f3e65eaa40978b61cd88f60c0 Author: Matthias Seidel Date: Mon Jul 9 15:05:51 2018 + Updated version number diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst index f841368438a8..913688c97769 100755 --- a/solenv/inc/version.lst +++ b/solenv/inc/version.lst @@ -20,9 +20,9 @@ #** OOOBASEVERSIONMAJOR=4 -OOOBASEVERSIONMINOR=0 +OOOBASEVERSIONMINOR=2 OOOBASEVERSIONMICRO=0 -OOOBASEVERSIONDAY=5 -OOOBASEVERSIONMONTH=2 -OOOBASEVERSIONYEAR=2013 +OOOBASEVERSIONDAY=9 +OOOBASEVERSIONMONTH=7 +OOOBASEVERSIONYEAR=2018 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - rat-excludes
rat-excludes |4 1 file changed, 4 insertions(+) New commits: commit 6b760c766bca7865cc116dce6016a6dd6df63534 Author: Matthias Seidel Date: Fri Jul 6 08:14:48 2018 + Updated excludes See: https://ci.apache.org/projects/openoffice/rat-output.html diff --git a/rat-excludes b/rat-excludes index 0eed4454d789..9566d2ab46de 100644 --- a/rat-excludes +++ b/rat-excludes @@ -60,6 +60,7 @@ main/desktop/win32/source/rebase/rctmpl.txt main/desktop/win32/source/setup/rcfooter.txt main/helpcontent2/helpers/unocmds.txt main/officecfg/util/delcomment.sed +main/ridljar/java/unoloader/src/main/java/com/sun/star/lib/unoloader/manifest main/sd/util/sdfilt.map main/sdext/source/minimizer/help/component.txt main/sdext/source/pdfimport/help/component.txt @@ -735,6 +736,7 @@ main/accessibility/workben/TODO main/accessibility/workben/org/openoffice/accessibility/awb/manifest main/afms/delzip main/automation/prj/l10n +main/avmedia/source/java/avmedia.jar.processed.component main/avmedia/source/java/manifest main/bean/util/delzip main/binfilter/no_localization @@ -746,6 +748,7 @@ main/cli_ure/source/native/cli_cppuhelper_config main/cli_ure/source/ure/cli_ure_config main/cli_ure/unotypes/cli_uretypes_config main/configmgr/qa/unit/no_localization +main/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h main/cppuhelper/qa/propertysetmixin/manifest main/desktop/scripts/basis-link main/desktop/scripts/odf-basis-link @@ -883,6 +886,7 @@ main/setup_native/source/packinfo/solariscopyrightfile main/sfx2/workben/custompanel/delzip main/smoketestdoc/com/sun/star/comp/smoketest/MANIFEST.MF main/smoketestdoc/com/sun/star/comp/smoketest/delzip +main/solenv/ant/manifest.empty main/solenv/bin/genmap main/solenv/bin/install-sh main/solenv/inc/startup/summary ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - desktop/util
dev/null |binary 1 file changed New commits: commit 1c241d624bfe75379548d3e9780318a038f1018a Author: Matthias Seidel Date: Fri Jul 6 07:53:01 2018 + Removing unused StarOffice icon diff --git a/desktop/util/soffice.ico b/desktop/util/soffice.ico deleted file mode 100644 index 88ccf5e5a6a0.. Binary files a/desktop/util/soffice.ico and /dev/null differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source
sd/source/ui/dlg/copydlg.src | 147 ++-
1 file changed, 49 insertions(+), 98 deletions(-)
New commits:
commit 2338f76f8746a7e33a853a1ede042d8634dff32f
Author: Matthias Seidel
Date: Thu Jul 5 19:40:37 2018 +
Cleaned up dialog for Duplicate
diff --git a/sd/source/ui/dlg/copydlg.src b/sd/source/ui/dlg/copydlg.src
index 36b96b8ab049..e547683631d4 100644
--- a/sd/source/ui/dlg/copydlg.src
+++ b/sd/source/ui/dlg/copydlg.src
@@ -31,40 +31,40 @@ ModalDialog DLG_COPY
HelpID = CMD_SID_COPYOBJECTS ;
OutputSize = TRUE ;
SVLook = TRUE ;
-Size = MAP_APPFONT ( 204 , 177 ) ;
+Size = MAP_APPFONT ( 204, 177 ) ;
Text [ en-US ] = "Duplicate" ;
Moveable = TRUE ;
OKButton BTN_OK
{
-Pos = MAP_APPFONT ( 148 , 6 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 148, 6 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton BTN_CANCEL
{
-Pos = MAP_APPFONT ( 148 , 23 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 148, 23 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
HelpButton BTN_HELP
{
-Pos = MAP_APPFONT ( 148 , 43 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 148, 43 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
FixedText FT_COPIES
{
-Pos = MAP_APPFONT ( 6 , 9 ) ;
-Size = MAP_APPFONT ( 60 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 9 ) ;
+Size = MAP_APPFONT ( 60, 8 ) ;
Text [ en-US ] = "Number of ~copies" ;
};
NumericField NUM_FLD_COPIES
{
HelpID = "sd:NumericField:DLG_COPY:NUM_FLD_COPIES";
Border = TRUE ;
-Pos = MAP_APPFONT ( 76 , 7 ) ;
-Size = MAP_APPFONT ( 35 , 12 ) ;
+Pos = MAP_APPFONT ( 76, 7 ) ;
+Size = MAP_APPFONT ( 35, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -78,8 +78,8 @@ ModalDialog DLG_COPY
ImageButton BTN_SET_VIEWDATA
{
HelpID = "sd:ImageButton:DLG_COPY:BTN_SET_VIEWDATA";
-Pos = MAP_APPFONT ( 122 , 6 ) ;
-Size = MAP_APPFONT ( 14 , 14 ) ;
+Pos = MAP_APPFONT ( 122, 6 ) ;
+Size = MAP_APPFONT ( 14, 14 ) ;
ButtonImage = Image
{
ImageBitmap = Bitmap { File = "pipette.bmp" ; };
@@ -91,8 +91,8 @@ ModalDialog DLG_COPY
PushButton BTN_SET_DEFAULT
{
HelpID = "sd:PushButton:DLG_COPY:BTN_SET_DEFAULT";
-Pos = MAP_APPFONT ( 148 , 63 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 148, 63 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Default";
};
@@ -100,8 +100,8 @@ ModalDialog DLG_COPY
{
HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_ANGLE";
Border = TRUE ;
-Pos = MAP_APPFONT ( 76 , 69 ) ;
-Size = MAP_APPFONT ( 45 , 12 ) ;
+Pos = MAP_APPFONT ( 76, 69 ) ;
+Size = MAP_APPFONT ( 45, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -114,22 +114,22 @@ ModalDialog DLG_COPY
};
FixedText FT_ANGLE
{
-Pos = MAP_APPFONT ( 12 , 71 ) ;
-Size = MAP_APPFONT ( 60 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 71 ) ;
+Size = MAP_APPFONT ( 60, 8 ) ;
Text [ en-US ] = "~Angle" ;
};
FixedText FT_MOVE_X
{
-Pos = MAP_APPFONT ( 12 , 39 ) ;
-Size = MAP_APPFONT ( 60 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 39 ) ;
+Size = MAP_APPFONT ( 60, 8 ) ;
Text [ en-US ] = "~X axis" ;
};
MetricField MTR_FLD_MOVE_X
{
HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_MOVE_X";
Border = TRUE ;
-Pos = MAP_APPFONT ( 76 , 37 ) ;
-Size = MAP_APPFONT ( 45 , 12 ) ;
+Pos = MAP_APPFONT ( 76, 37 ) ;
+Size = MAP_APPFONT ( 45, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -146,8 +146,8 @@ ModalDialog DLG_COPY
{
HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_MOVE_Y";
Border = TRUE ;
-Pos = MAP_APPFONT ( 76 , 53 ) ;
-Size = MAP_APPFONT ( 45 , 12 ) ;
+Pos = MAP_APPFONT ( 76, 53 ) ;
+Size = MAP_APPFONT ( 45, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -164,8 +164,8 @@ ModalDialog DLG_COPY
{
HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_WIDTH";
Border = TRUE ;
-Pos = MAP_APPFONT ( 76 , 98 ) ;
-Size = MAP_APPFONT ( 45 , 12 ) ;
+Pos = MAP_APPFONT ( 76, 98 ) ;
+Size = MAP_APPFONT ( 45, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - rat-excludes sd/source solenv/gbuild
rat-excludes | 12 ++--
sd/source/ui/dlg/layeroptionsdlg.src | 95 +--
solenv/gbuild/platform/macosx.mk |9 +++
3 files changed, 40 insertions(+), 76 deletions(-)
New commits:
commit 8018da421604d0f0e72db93b024b818aa21ef068
Author: Matthias Seidel
Date: Thu Jul 5 17:56:35 2018 +
Cleaned up dialog for layers
diff --git a/sd/source/ui/dlg/layeroptionsdlg.src
b/sd/source/ui/dlg/layeroptionsdlg.src
index 1a88a772dbe5..3dc7e2f28bd5 100644
--- a/sd/source/ui/dlg/layeroptionsdlg.src
+++ b/sd/source/ui/dlg/layeroptionsdlg.src
@@ -30,14 +30,14 @@ ModalDialog DLG_INSERT_LAYER
HelpID = CMD_SID_INSERTLAYER ;
OutputSize = TRUE ;
SVLook = TRUE ;
-Size = MAP_APPFONT ( 200 , 172 ) ;
+Size = MAP_APPFONT ( 200, 172 ) ;
Text [ en-US ] = "Insert Layer" ;
Moveable = TRUE ;
FixedText FT_NAME
{
-Pos = MAP_APPFONT ( 6 , 6 ) ;
-Size = MAP_APPFONT ( 188 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 6 ) ;
+Size = MAP_APPFONT ( 188, 8 ) ;
Text [ en-US ] = "~Name" ;
};
@@ -45,15 +45,15 @@ ModalDialog DLG_INSERT_LAYER
{
HelpID = "sd:Edit:DLG_INSERT_LAYER:EDT_NAME";
Border = TRUE ;
-Pos = MAP_APPFONT ( 6 , 17 ) ;
-Size = MAP_APPFONT ( 188 , 12 ) ;
+Pos = MAP_APPFONT ( 6, 17 ) ;
+Size = MAP_APPFONT ( 188, 12 ) ;
TabStop = TRUE ;
};
FixedText FT_TITLE
{
-Pos = MAP_APPFONT ( 6 , 32 ) ;
-Size = MAP_APPFONT ( 188 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 32 ) ;
+Size = MAP_APPFONT ( 188, 8 ) ;
Text [ en-US ] = "~Title" ;
};
@@ -61,15 +61,15 @@ ModalDialog DLG_INSERT_LAYER
{
HelpID = "sd:Edit:DLG_INSERT_LAYER:EDT_TITLE";
Border = TRUE ;
-Pos = MAP_APPFONT ( 6 , 43 ) ;
-Size = MAP_APPFONT ( 188 , 12 ) ;
+Pos = MAP_APPFONT ( 6, 43 ) ;
+Size = MAP_APPFONT ( 188, 12 ) ;
TabStop = TRUE ;
};
FixedText FT_DESCRIPTION
{
-Pos = MAP_APPFONT ( 6 , 58 ) ;
-Size = MAP_APPFONT ( 188 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 58 ) ;
+Size = MAP_APPFONT ( 188, 8 ) ;
Text [ en-US ] = "~Description" ;
};
@@ -77,8 +77,8 @@ ModalDialog DLG_INSERT_LAYER
{
HelpID = "sd:MultiLineEdit:DLG_INSERT_LAYER:EDT_DESCRIPTION";
Border = TRUE ;
-Pos = MAP_APPFONT ( 6 , 69 ) ;
-Size = MAP_APPFONT ( 188 , 34 ) ;
+Pos = MAP_APPFONT ( 6, 69 ) ;
+Size = MAP_APPFONT ( 188, 34 ) ;
TabStop = TRUE ;
IgnoreTab = TRUE;
VScroll = TRUE;
@@ -87,8 +87,8 @@ ModalDialog DLG_INSERT_LAYER
CheckBox CBX_VISIBLE
{
HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_VISIBLE";
-Pos = MAP_APPFONT ( 6 , 106 ) ;
-Size = MAP_APPFONT ( 188 , 10 ) ;
+Pos = MAP_APPFONT ( 6, 106 ) ;
+Size = MAP_APPFONT ( 188, 10 ) ;
Text [ en-US ] = "~Visible" ;
TabStop = TRUE ;
};
@@ -96,8 +96,8 @@ ModalDialog DLG_INSERT_LAYER
CheckBox CBX_PRINTABLE
{
HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_PRINTABLE";
-Pos = MAP_APPFONT ( 6 , 119 ) ;
-Size = MAP_APPFONT ( 188 , 10 ) ;
+Pos = MAP_APPFONT ( 6, 119 ) ;
+Size = MAP_APPFONT ( 188, 10 ) ;
Text [ en-US ] = "~Printable" ;
TabStop = TRUE ;
};
@@ -105,82 +105,37 @@ ModalDialog DLG_INSERT_LAYER
CheckBox CBX_LOCKED
{
HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_LOCKED";
-Pos = MAP_APPFONT ( 6 , 132 ) ;
-Size = MAP_APPFONT ( 188 , 10 ) ;
+Pos = MAP_APPFONT ( 6, 132 ) ;
+Size = MAP_APPFONT ( 188, 10 ) ;
Text [ en-US ] = "~Locked" ;
TabStop = TRUE ;
};
-// divider
+// Divider
FixedLine FL_SEPARATOR_B
{
-Pos = MAP_APPFONT ( 0 , 144 ) ;
-Size = MAP_APPFONT ( 200 , 4 ) ;
+Pos = MAP_APPFONT ( 0, 144 ) ;
+Size = MAP_APPFONT ( 200, 4 ) ;
};
// Buttons
HelpButton BTN_HELP
{
Pos = MAP_APPFONT ( 6, 152 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
OKButton BTN_OK
{
Pos = MAP_APPFONT ( 200 - (50 + 50 + 9), 152) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton BTN_CANCEL
{
Pos = MAP_APPFONT ( 200 - (50 + 6), 152) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
commit 891d5f8f1b7dea5436fde2c22d24aa20997f6f56
Author: Jim Jagi
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - lingucomponent/Library_MacOSXSpell.mk lingucomponent/Library_spell.mk rat-excludes
lingucomponent/Library_MacOSXSpell.mk |5 - lingucomponent/Library_spell.mk | 13 + rat-excludes | 33 + 3 files changed, 30 insertions(+), 21 deletions(-) New commits: commit 2db33b2791a2189d9e6a8e2a4c7f0da7822eb4c2 Author: Matthias Seidel Date: Thu Jul 5 15:43:08 2018 + Updated excludes See: https://ci.apache.org/projects/openoffice/rat-output.html diff --git a/rat-excludes b/rat-excludes index e628a2fae662..d9ac3d17c2db 100644 --- a/rat-excludes +++ b/rat-excludes @@ -10,8 +10,8 @@ ext_libraries/ ## # # external libraries that are not part of the source release, but may be built -# for the binary AOO incarnations dependent on the used configure switches. -# Each subproject contains a framework to get the library as tarball (from +# for the binary AOO incarnations dependent on the used configure switches. +# Each subproject contains a framework to get the library as tarball (from # ext_sources), patch and build it. It does not contain the external libraries # themselves. # @@ -170,11 +170,11 @@ main/testautomation/writer/optional/input/import/amipro3.sam # AOO specific OpenSymbol source file, (S)ource(F)orge(D)ata, recently called (S)pline(F)ont(D)ata main/extras/source/truetype/symbol/OpenSymbol.sfd -# used in main/writerfilter/source/rtftok/RTFScanner.skl (1), part of SGA +# used in main/writerfilter/source/rtftok/RTFScanner.skl (1), part of SGA # binary file (?) main/writerfilter/source/rtftok/RTFScanner.skl -# used in main/testautomation/spreadsheet/optional/input/loadsave/microsoft/sylk.slk (1), part of SGA +# used in main/testautomation/spreadsheet/optional/input/loadsave/microsoft/sylk.slk (1), part of SGA # SYLK spreadsheet, ascii. Comments possible (see in file), ALv2 may be added here main/testautomation/spreadsheet/optional/input/loadsave/microsoft/sylk.slk @@ -234,7 +234,7 @@ main/migrationanalysis/src/wizard/Wizard.DCA # Delphi Form main/odk/examples/OLE/delphi/InsertTables/SampleUI.dfm -# used in main/wizards/source/gimmicks/readdirs.dlg (1), part of SGA +# used in main/wizards/source/gimmicks/readdirs.dlg (1), part of SGA # Dialog Creation Template (for Excel) (?) main/wizards/source/gimmicks/readdirs.dlg @@ -266,7 +266,7 @@ main/odk/examples/OLE/delphi/InsertTables/Project1.dpr # Library definition files (21), no creative content **/*.def -# Developer Studio project file (4), no creative content +# Developer Studio project file (4), no creative content **/*.dsp # Defines library export symbols (36), no creative content @@ -275,7 +275,7 @@ main/odk/examples/OLE/delphi/InsertTables/Project1.dpr # symbnol export filter files (20), no creative content **/*.flt -# (>50), part of SGA +# (>50), part of SGA # Install Definition Tables, ascii, not sure about comment support #**/*.idt main/instsetoo_native/inc_ooolangpack/windows/msi_templates/*.idt @@ -293,7 +293,7 @@ main/instsetoo_native/inc_ure/windows/msi_templates/*.idt # no creative content **/*.mf -# (3) used as *.patch.mingw, a diff for preparing external stuff for build, all in SGA +# (3) used as *.patch.mingw, a diff for preparing external stuff for build, all in SGA # no creative content **/*.mingw @@ -351,9 +351,9 @@ main/testautomation/framework/optional/input/menu/en-us_writer.txt main/automation/source/miniapp/test.win main/testautomation/global/win/*.win -# (7), part of SGA +# (7), part of SGA # ascii, ALv2 may be added here -# Added ALv2 in these files +# Added ALv2 in these files # main/testautomation/global/sid/*.sid # (158), part of SGA @@ -446,7 +446,7 @@ main/xmlsecurity/test_docs/CAs/*/*.pem main/bean/test/applet/oooapplet/bean.policy main/stoc/test/security/test_security.policy -# Postscript files, used for configuration +# Postscript files, used for configuration main/psprint_config/configuration/ppds/**/*.PS main/testgraphical/references/**/*.PS @@ -515,7 +515,7 @@ main/testautomation/writer/optional/input/export/filter/*.w95 # patch files main/redland/raptor/raptor-1.4.18.patch.win32 main/redland/rasqal/rasqal-0.9.16.patch.win32 -main/redland/redland/redland-1.0.8.patch.win32 +main/redland/redland/redland-1.0.17.patch.win32 # (1000+), part of SGA # AOO library files, XML, ALv2 could be added @@ -726,7 +726,7 @@ main/odk/examples/OLE/vbscript/WriterDemo.vbs ## # -# files not requiring a header - empty or generated files +# files not requiring a header - empty or generated files # main/accessibility/bridge/org/openoffice/accessibility/manifest @@ -853,7 +853,7 @@ main/qadevOOo/testdocs/qadevlibs/source/test/manifest main/rat-excludes main/redland/raptor/raptor-1.4.18.patch.os2 main/redland/rasqal/rasqal-0.9.16.patch.os2 -main/redland/redland/redland
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/introabout
default_images/introabout/logo.png |binary 1 file changed New commits: commit fecd7bd58075f721303296334b70e48a88f6118e Author: Matthias Seidel Date: Wed Jul 4 18:50:59 2018 + Set print resolution to 144 pixel/inch diff --git a/default_images/introabout/logo.png b/default_images/introabout/logo.png index 980d8e8c50f6..834e143b77dc 100644 Binary files a/default_images/introabout/logo.png and b/default_images/introabout/logo.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source
cui/source/tabpages/page.cxx | 42 +-
1 file changed, 21 insertions(+), 21 deletions(-)
New commits:
commit fbdc623e8c9e1688f2261320ae6b8d87838da9bf
Author: Matthias Seidel
Date: Tue Jul 3 12:39:09 2018 +
Fixing German Umlaute in comments for later translation
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 887a882f609d..7aa17089dcb2 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -226,7 +226,7 @@ sal_Bool IsEqualSize_Impl( const SvxSizeItem* pSize, const
Size& rSize )
// class SvxPageDescPage --
-// gibt den Bereich der Which-Werte zur"uck
+// gibt den Bereich der Which-Werte zurück
sal_uInt16* SvxPageDescPage::GetRanges()
{
@@ -372,7 +372,7 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const
SfxItemSet& rAttr )
MapMode aOldMode = mpDefPrinter->GetMapMode();
mpDefPrinter->SetMapMode( MAP_TWIP );
-// First- und Last-Werte f"ur die R"ander setzen
+// First- und Last-Werte für die Ränder setzen
Size aPaperSize = mpDefPrinter->GetPaperSize();
Size aPrintSize = mpDefPrinter->GetOutputSize();
/*
@@ -492,7 +492,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
DBG_ASSERT( pPool, "Wo ist der Pool" );
SfxMapUnit eUnit = pPool->GetMetric( GetWhich( SID_ATTR_LRSPACE ) );
-// R"ander (Links/Rechts) einstellen
+// Ränder (Links/Rechts) einstellen
const SfxPoolItem* pItem = GetItem( rSet, SID_ATTR_LRSPACE );
if ( pItem )
@@ -506,7 +506,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
(sal_uInt16)ConvertLong_Impl( (long)rLRSpace.GetRight(), eUnit ) );
}
-// R"ander (Oben/Unten) einstellen
+// Ränder (Oben/Unten) einstellen
pItem = GetItem( rSet, SID_ATTR_ULSPACE );
if ( pItem )
@@ -688,7 +688,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
// Header Footer anzeigen
InitHeadFoot_Impl( rSet );
-// R"ander auf Hoch/Quer updaten, dann Beispiel updaten
+// Ränder auf Hoch/Quer updaten, dann Beispiel updaten
bBorderModified = sal_False;
SwapFirstValues_Impl( sal_False );
UpdateExample_Impl();
@@ -763,7 +763,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
// alten linken und rechten Rand kopieren
SvxLRSpaceItem aMargin( (const SvxLRSpaceItem&)rOldSet.Get( nWhich ) );
-// alten oberen und unteren Rand kopieren
+// alten oberen und unteren Rand kopieren
nWhich = GetWhich( SID_ATTR_ULSPACE );
SvxULSpaceItem aTopMargin( (const SvxULSpaceItem&)rOldSet.Get( nWhich ) );
@@ -978,7 +978,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
IMPL_LINK( SvxPageDescPage, LayoutHdl_Impl, ListBox *, EMPTYARG )
{
-// innen au\sen umschalten
+// Innen/Außen umschalten
const sal_uInt16 nPos = PosToPageUsage_Impl(
aLayoutBox.GetSelectEntryPos() );
if ( nPos == SVX_PAGE_MIRROR )
@@ -1006,7 +1006,7 @@ IMPL_LINK( SvxPageDescPage, LayoutHdl_Impl, ListBox *,
EMPTYARG )
IMPL_LINK( SvxPageDescPage, PaperBinHdl_Impl, ListBox *, EMPTYARG )
{
if ( aPaperTrayBox.GetEntryCount() > 1 )
-// schon gef"ullt
+// schon gefüllt
return 0;
// Schacht-Box initialisieren
@@ -1062,7 +1062,7 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox
*, pBox )
SetMetricValue( aPaperHeightEdit, aSize.Height(), SFX_MAPUNIT_100TH_MM
);
SetMetricValue( aPaperWidthEdit, aSize.Width(), SFX_MAPUNIT_100TH_MM );
-// R"ander ggf. neu berechnen
+// Ränder ggf. neu berechnen
CalcMargin_Impl();
RangeHdl_Impl( 0 );
@@ -1078,7 +1078,7 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox
*, pBox )
// bei Bildschirm keinen Rand
nTmp = 1; // entspr. 1cm
-// Abfragen, ob fuer Raender 0 gesetzt ist:
+// Abfragen, ob für Ränder 0 gesetzt ist:
if ( bScreen || aRightMarginEdit.GetValue() == 0 )
{
SetMetricValue( aRightMarginEdit, nTmp, SFX_MAPUNIT_CM );
@@ -1180,7 +1180,7 @@ void SvxPageDescPage::SwapFirstValues_Impl( FASTBOOL bSet
)
mpDefPrinter->SetOrientation( eOri );
mpDefPrinter->SetMapMode( MAP_TWIP );
-// First- und Last-Werte f"ur die R"ander setzen
+// First- und Last-Werte für die Ränder setzen
Size aPaperSize = mpDefPrinter->GetPaperSize();
Size aPrintSize = mpDefPrinter->GetOutputSize();
/*
@@ -1257,7 +1257,7 @@ void SvxPageDescPage::UpdateExample_Impl( bool
bResetbackground )
aBspWin.SetSize( aSize );
-// R"ander
+// Ränder
aBspWin.SetTop( GetCoreValue( aTopMarginEdit, SFX_MAPUNIT_TWIP ) );
aBspWin.SetBottom( GetCoreValue( aBottomMarg
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source
cui/source/tabpages/page.src | 162 +--
1 file changed, 81 insertions(+), 81 deletions(-)
New commits:
commit 425b62ddc26adb5e9a2e21ebfe1d46b9005caba5
Author: Matthias Seidel
Date: Tue Jul 3 11:18:08 2018 +
Cleaned up page dialog
diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index 7971ffe96b61..65a1f1fc7022 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -35,31 +35,31 @@ TabPage RID_SVXPAGE_PAGE
{
HelpId = HID_FORMAT_PAGE ;
Hide = TRUE ;
-Size = MAP_APPFONT ( 260 , 185 ) ;
+Size = MAP_APPFONT ( 260, 185 ) ;
FixedLine FL_PAPER_SIZE
{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 164 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 3 ) ;
+Size = MAP_APPFONT ( 164, 8 ) ;
Text [ en-US ] = "Paper format" ;
};
FixedText FT_PAPER_FORMAT
{
-Pos = MAP_APPFONT ( 12 , 16 ) ;
-Size = MAP_APPFONT ( 35 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 16 ) ;
+Size = MAP_APPFONT ( 35, 8 ) ;
Text [ en-US ] = "~Format";
};
ListBox LB_PAPER_SIZE
{
HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE";
-Pos = MAP_APPFONT ( 50 , 14 ) ;
-Size = MAP_APPFONT ( 50 , 64 ) ;
+Pos = MAP_APPFONT ( 50, 14 ) ;
+Size = MAP_APPFONT ( 75, 64 ) ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
};
FixedText FT_PAPER_WIDTH
{
-Pos = MAP_APPFONT ( 12 , 32 ) ;
-Size = MAP_APPFONT ( 35 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 32 ) ;
+Size = MAP_APPFONT ( 35, 8 ) ;
Text [ en-US ] = "~Width" ;
Left = TRUE ;
};
@@ -68,7 +68,7 @@ TabPage RID_SVXPAGE_PAGE
HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH";
Border = TRUE ;
Pos = MAP_APPFONT ( 50, 30 ) ;
-Size = MAP_APPFONT ( 40 , 12 ) ;
+Size = MAP_APPFONT ( 40, 12 ) ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -80,8 +80,8 @@ TabPage RID_SVXPAGE_PAGE
};
FixedText FT_PAPER_HEIGHT
{
-Pos = MAP_APPFONT ( 12 , 48 ) ;
-Size = MAP_APPFONT ( 35 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 48 ) ;
+Size = MAP_APPFONT ( 35, 8 ) ;
Text [ en-US ] = "~Height" ;
Left = TRUE ;
};
@@ -89,8 +89,8 @@ TabPage RID_SVXPAGE_PAGE
{
HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT";
Border = TRUE ;
-Pos = MAP_APPFONT ( 50 , 46 ) ;
-Size = MAP_APPFONT ( 40 , 12 ) ;
+Pos = MAP_APPFONT ( 50, 46 ) ;
+Size = MAP_APPFONT ( 40, 12 ) ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -102,35 +102,35 @@ TabPage RID_SVXPAGE_PAGE
};
FixedText FT_ORIENTATION
{
-Pos = MAP_APPFONT ( 12 , 62 ) ;
-Size = MAP_APPFONT ( 35 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 62 ) ;
+Size = MAP_APPFONT ( 35, 8 ) ;
Text [ en-US ] = "Orientation";
};
RadioButton RB_PORTRAIT
{
HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT";
-Pos = MAP_APPFONT ( 50 , 62 ) ;
-Size = MAP_APPFONT ( 53 , 10 ) ;
+Pos = MAP_APPFONT ( 50, 62 ) ;
+Size = MAP_APPFONT ( 53, 10 ) ;
Check = TRUE ;
Text [ en-US ] = "~Portrait" ;
};
RadioButton RB_LANDSCAPE
{
HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE";
-Pos = MAP_APPFONT ( 50 , 74 ) ;
-Size = MAP_APPFONT ( 53 , 10 ) ;
+Pos = MAP_APPFONT ( 50, 74 ) ;
+Size = MAP_APPFONT ( 53, 10 ) ;
Text [ en-US ] = "L~andscape";
};
Window WN_BSP
{
-Pos = MAP_APPFONT ( 176 , 6 ) ;
-Size = MAP_APPFONT ( 75 , 46 ) ;
+Pos = MAP_APPFONT ( 176, 6 ) ;
+Size = MAP_APPFONT ( 75, 46 ) ;
};
FixedText FT_TEXT_FLOW
{
-Pos = MAP_APPFONT ( 113 , 60 ) ;
-Size = MAP_APPFONT ( 50 , 8 ) ;
+Pos = MAP_APPFONT ( 113, 60 ) ;
+Size = MAP_APPFONT ( 50, 8 ) ;
Left = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "~Text direction";
@@ -139,37 +139,37 @@ TabPage RID_SVXPAGE_PAGE
{
HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_TEXT_FLOW";
Border = TRUE ;
-Pos = MAP_APPFONT ( 165 , 58 ) ;
-Size = MAP_APPFONT ( 83 , 50 ) ;
+Pos = MAP_APPFONT ( 165, 58 ) ;
+Size = MAP_APPFONT ( 83, 50 ) ;
DropDown = TRUE ;
Hide = TRUE ;
};
FixedText FT_PAPER_TRAY
{
-Pos = MAP_APPFONT ( 113 , 74 ) ;
-Size = MAP_APPFONT ( 50 , 8 ) ;
+Pos = MAP_APPFONT ( 113, 74 ) ;
+Size = MAP_APPFONT ( 50, 8 ) ;
Left = TRUE ;
Text [ en-US ] = "Paper ~tray&
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source
sd/source/ui/slideshow/slideshow.src | 76 +--
1 file changed, 38 insertions(+), 38 deletions(-)
New commits:
commit 4483e2c33766ce720577033324b51a333de0d5b6
Author: Matthias Seidel
Date: Sun Jul 1 12:04:41 2018 +
Minor cleanup
diff --git a/sd/source/ui/slideshow/slideshow.src
b/sd/source/ui/slideshow/slideshow.src
index d872375d4a57..bf9bd544f85a 100644
--- a/sd/source/ui/slideshow/slideshow.src
+++ b/sd/source/ui/slideshow/slideshow.src
@@ -28,21 +28,21 @@ Menu RID_SLIDESHOW_CONTEXTMENU
{
ItemList =
{
+MenuItem
+{
+Identifier = CM_NEXT_SLIDE ;
+Text [ en-US ] = "~Next" ;
+};
+MenuItem
+{
+Identifier = CM_PREV_SLIDE ;
+Text [ en-US ] = "~Previous" ;
+};
MenuItem
{
-Identifier = CM_NEXT_SLIDE ;
-Text [ en-US ] = "~Next" ;
-};
-MenuItem
-{
-Identifier = CM_PREV_SLIDE ;
-Text [ en-US ] = "~Previous" ;
- };
-MenuItem
-{
-Identifier = CM_GOTO;
-Text [ en-US ] = "~Go to Slide" ;
-SubMenu = Menu
+Identifier = CM_GOTO;
+Text [ en-US ] = "~Go to Slide" ;
+SubMenu = Menu
{
ItemList =
{
@@ -80,31 +80,31 @@ Menu RID_SLIDESHOW_CONTEXTMENU
{
ItemList =
{
-MenuItem
-{
-Identifier = CM_WIDTH_PEN_VERY_THIN;
-Text [ en-US ] = "~Very thin";
-};
-MenuItem
-{
-Identifier = CM_WIDTH_PEN_THIN;
-Text [ en-US ] = "~Thin";
-};
-MenuItem
-{
-Identifier = CM_WIDTH_PEN_NORMAL;
-Text [ en-US ] = "~Normal";
-};
-MenuItem
-{
-Identifier = CM_WIDTH_PEN_THICK;
-Text [ en-US ] = "~Thick";
-};
-MenuItem
-{
-Identifier = CM_WIDTH_PEN_VERY_THICK;
-Text [ en-US ] = "~Very Thick";
-};
+MenuItem
+{
+Identifier = CM_WIDTH_PEN_VERY_THIN;
+Text [ en-US ] = "~Very thin";
+};
+MenuItem
+{
+Identifier = CM_WIDTH_PEN_THIN;
+Text [ en-US ] = "~Thin";
+};
+MenuItem
+{
+Identifier = CM_WIDTH_PEN_NORMAL;
+Text [ en-US ] = "~Normal";
+};
+MenuItem
+{
+Identifier = CM_WIDTH_PEN_THICK;
+Text [ en-US ] = "~Thick";
+};
+MenuItem
+{
+Identifier = CM_WIDTH_PEN_VERY_THICK;
+Text [ en-US ] = "~Very thick";
+};
};
};
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
