[Libreoffice-commits] .: vcl/win
vcl/win/source/window/keynames.cxx | 22 ++
1 file changed, 22 insertions(+)
New commits:
commit c9b89297b34051e115d9c5587ae5b80641c1c6b4
Author: Aurimas Fišeras auri...@members.fsf.org
Date: Sat Jan 19 22:08:52 2013 +0200
Add Lithuanian translations of keyboard shortcuts (related to fdo#54165)
Change-Id: I0e9460adeebb2e2a46ca3cd0e683cd4f0026916b
Reviewed-on: https://gerrit.libreoffice.org/1775
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/vcl/win/source/window/keynames.cxx
b/vcl/win/source/window/keynames.cxx
index eb73b5f..0d53261 100755
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/source/window/keynames.cxx
@@ -112,6 +112,27 @@ namespace vcl_sal {
{ KEY_SPACEBAR, Tühik },
};
+static const struct KeysNameReplacement aImplReplacements_Lithuanian[] =
+{
+{ KEY_ESC, Gr },
+{ KEY_BACK, Naikinti },
+{ KEY_ENTER, Įvesti },
+{ KEY_SPACEBAR, Tarpas },
+{ KEY_HOME, Prad },
+{ KEY_UP, Aukštyn },
+{ KEY_PAGEUP, Pslâ },
+{ KEY_LEFT, KairÄn },
+{ KEY_RIGHT, DeÅ¡inÄn },
+{ KEY_END, Pab },
+{ KEY_DOWN, Žemyn },
+{ KEY_PAGEDOWN, Pslâ },
+{ KEY_INSERT, Įterpti },
+{ KEY_DELETE, Å al },
+{ KEY_CONTROL, Vald },
+{ KEY_SHIFT, Lyg2 },
+{ KEY_ALT, Alt },
+};
+
static const struct KeysNameReplacement aImplReplacements_Slovenian[] =
{
{ KEY_ESC, Ubežnica },
@@ -156,6 +177,7 @@ namespace vcl_sal {
{ ast,aImplReplacements_Asturian,
SAL_N_ELEMENTS(aImplReplacements_Asturian) },
{ ca, aImplReplacements_Catalan,
SAL_N_ELEMENTS(aImplReplacements_Catalan) },
{ et, aImplReplacements_Estonian,
SAL_N_ELEMENTS(aImplReplacements_Estonian) },
+{ lt, aImplReplacements_Lithuanian,
SAL_N_ELEMENTS(aImplReplacements_Lithuanian) },
{ sl, aImplReplacements_Slovenian,
SAL_N_ELEMENTS(aImplReplacements_Slovenian) },
{ es, aImplReplacements_Spanish,
SAL_N_ELEMENTS(aImplReplacements_Spanish) },
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/window/keynames.cxx | 60 +
1 file changed, 60 insertions(+)
New commits:
commit 2f9cc7a486f89fe34e44f45399ddbeb240a3adb1
Author: Petr Mladek pmla...@suse.cz
Date: Mon Jan 21 16:07:25 2013 +0100
Add Asturian, Slovenian, and Spanish translations of keymanes for Windows
Asturian by Xuacu xuacusk8 at gmail dot com
Spanish by Adolfo Jayme Barrientos fitoschido at ubuntu dot com
Slovenian by Martin Srebotnjak miles at filmsi dot net
Change-Id: I29387f5908ea456abc5c464a03cc74c718ae6b74
diff --git a/vcl/win/source/window/keynames.cxx
b/vcl/win/source/window/keynames.cxx
index dc58acd..eb73b5f 100755
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/source/window/keynames.cxx
@@ -65,6 +65,24 @@ namespace vcl_sal {
//
//
+static const struct KeysNameReplacement aImplReplacements_Asturian[] =
+{
+{ KEY_BACK, Retrocesu },
+{ KEY_ENTER, Intro },
+{ KEY_SPACEBAR, Espaciu },
+{ KEY_HOME, Aniciu },
+{ KEY_UP, Arriba },
+{ KEY_PAGEUP, Re Páx },
+{ KEY_LEFT, Izquierda },
+{ KEY_RIGHT, Drecha },
+{ KEY_END, Fin },
+{ KEY_DOWN, Abaxo },
+{ KEY_PAGEDOWN, Av Páx },
+{ KEY_INSERT, Ins },
+{ KEY_DELETE, Supr },
+{ KEY_SHIFT, Mayús },
+};
+
static const struct KeysNameReplacement aImplReplacements_Catalan[] =
{
{ KEY_BACK, Retrocés },
@@ -94,10 +112,52 @@ namespace vcl_sal {
{ KEY_SPACEBAR, Tühik },
};
+static const struct KeysNameReplacement aImplReplacements_Slovenian[] =
+{
+{ KEY_ESC, Ubežnica },
+{ KEY_BACK, VraÄalka },
+{ KEY_ENTER, Vnašalka },
+{ KEY_SPACEBAR, Preslednica },
+{ KEY_HOME, ZaÄetek },
+{ KEY_UP, Navzgor },
+{ KEY_PAGEUP, Prejšnja stran },
+{ KEY_LEFT, Levo },
+{ KEY_RIGHT, Desno },
+{ KEY_END, Konec },
+{ KEY_DOWN, Navzdol },
+{ KEY_PAGEDOWN, Naslednja stran },
+{ KEY_INSERT, Vrivalka },
+{ KEY_DELETE, Brisalka },
+{ KEY_CONTROL, Krmilka },
+{ KEY_SHIFT, Dvigalka },
+{ KEY_ALT, Izmenjalka },
+};
+
+static const struct KeysNameReplacement aImplReplacements_Spanish[] =
+{
+{ KEY_BACK, Retroceso },
+{ KEY_ENTER, Intro },
+{ KEY_SPACEBAR, Espacio },
+{ KEY_HOME, Inicio },
+{ KEY_UP, Arriba },
+{ KEY_PAGEUP, Re Pág },
+{ KEY_LEFT, Izquierda },
+{ KEY_RIGHT, Derecha },
+{ KEY_END, Fin },
+{ KEY_DOWN, Abajo },
+{ KEY_PAGEDOWN, Av Pág },
+{ KEY_INSERT, Ins },
+{ KEY_DELETE, Supr },
+{ KEY_SHIFT, Mayús },
+};
+
static const struct KeyboardReplacements aKeyboards[] =
{
+{ ast,aImplReplacements_Asturian,
SAL_N_ELEMENTS(aImplReplacements_Asturian) },
{ ca, aImplReplacements_Catalan,
SAL_N_ELEMENTS(aImplReplacements_Catalan) },
{ et, aImplReplacements_Estonian,
SAL_N_ELEMENTS(aImplReplacements_Estonian) },
+{ sl, aImplReplacements_Slovenian,
SAL_N_ELEMENTS(aImplReplacements_Slovenian) },
+{ es, aImplReplacements_Spanish,
SAL_N_ELEMENTS(aImplReplacements_Spanish) },
};
// translate keycodes, used within the displayed menu shortcuts
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/window/keynames.cxx | 12
1 file changed, 12 insertions(+)
New commits:
commit 42c0fa1b60fa0780ed4ac57679f118cab8f1f143
Author: Jesús Corrius jcorr...@gmail.com
Date: Tue Jan 15 15:45:54 2013 +0100
fdo#54165: Add key replacement names for Estonian (Patch by: Mihkel Tõnnov)
Change-Id: I6cb2eddf3fa2fbd492214fd092b394227d1e52c0
Reviewed-on: https://gerrit.libreoffice.org/1695
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/vcl/win/source/window/keynames.cxx
b/vcl/win/source/window/keynames.cxx
index 153fc07..dc58acd 100755
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/source/window/keynames.cxx
@@ -83,9 +83,21 @@ namespace vcl_sal {
{ KEY_SHIFT, Maj },
};
+static const struct KeysNameReplacement aImplReplacements_Estonian[] =
+{
+{ KEY_RIGHT, Nool paremale },
+{ KEY_LEFT, Nool vasakule },
+{ KEY_UP, Nool üles },
+{ KEY_DOWN, Nool alla },
+{ KEY_BACK, Tagasilüke },
+{ KEY_ENTER, Enter },
+{ KEY_SPACEBAR, Tühik },
+};
+
static const struct KeyboardReplacements aKeyboards[] =
{
{ ca, aImplReplacements_Catalan,
SAL_N_ELEMENTS(aImplReplacements_Catalan) },
+{ et, aImplReplacements_Estonian,
SAL_N_ELEMENTS(aImplReplacements_Estonian) },
};
// translate keycodes, used within the displayed menu shortcuts
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/window/salframe.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0a28778e9a2a02382ab5ccd79035500334504f17
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Jan 9 21:12:29 2013 +0100
mingw tinderbox doesn't know wcscpy_r()
Moreover, according to MSDN, wcscpy() in C++ is a template that doesn't
need the length passed, so this shouldn't make actually anything worse.
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index 17646f2..11de1f8 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2414,7 +2414,7 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode*
pBuf,
else
{
nKeyLen = aRet.getLength();
-wcscpy_s( aKeyBuf, nMaxKeyLen, aRet.getStr() );
+wcscpy( aKeyBuf, aRet.getStr() );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/window/salframe.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f5d047dcb80d760d46e90a1dacad206ddf55d827
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Jan 9 21:29:52 2013 +0100
second try with wcscpy()
On mingw sal_Unicode is not wchar_t (see sal/types.h).
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index 11de1f8..235436f 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2414,7 +2414,7 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode*
pBuf,
else
{
nKeyLen = aRet.getLength();
-wcscpy( aKeyBuf, aRet.getStr() );
+wcscpy( aKeyBuf, reinterpret_cast const wchar_t* ( aRet.getStr()
));
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salgdi3.cxx | 184 -
1 file changed, 92 insertions(+), 92 deletions(-)
New commits:
commit 83f684c86c22df40ff1ef5fe7dc4b829a66c2645
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jan 7 14:34:55 2013 +0100
vcl: port WinSalGraphics and friends to new getter/setter methods
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index da4f4e0..69a05ee 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -155,17 +155,17 @@ ImplFontAttrCache::ImplFontAttrCache( const String
rFileNameURL, const String
aFontFileURL =
read_lenPrefixed_uInt8s_ToOUStringsal_uInt16(aCacheFile,
RTL_TEXTENCODING_UTF8);
if( !aFontFileURL.Len() )
break;
-aDFA.maName =
read_lenPrefixed_uInt8s_ToOUStringsal_uInt16(aCacheFile,
RTL_TEXTENCODING_UTF8);
+
aDFA.SetFamilyName(read_lenPrefixed_uInt8s_ToOUStringsal_uInt16(aCacheFile,
RTL_TEXTENCODING_UTF8));
short n;
-aCacheFile n; aDFA.meWeight = static_castFontWeight(n);
-aCacheFile n; aDFA.meItalic = static_castFontItalic(n);
-aCacheFile n; aDFA.mePitch = static_castFontPitch(n);
-aCacheFile n; aDFA.meWidthType = static_castFontWidth(n);
-aCacheFile n; aDFA.meFamily = static_castFontFamily(n);
-aCacheFile n; aDFA.mbSymbolFlag = (n != 0);
+aCacheFile n; aDFA.SetWeight(static_castFontWeight(n));
+aCacheFile n; aDFA.SetItalic(static_castFontItalic(n));
+aCacheFile n; aDFA.SetPitch(static_castFontPitch(n));
+aCacheFile n; aDFA.SetWidthType(static_castFontWidth(n));
+aCacheFile n; aDFA.SetFamilyType(static_castFontFamily(n));
+aCacheFile n; aDFA.SetSymbolFlag(n != 0);
-aCacheFile.ReadByteStringLine( aDFA.maStyleName, RTL_TEXTENCODING_UTF8
);
+aCacheFile.ReadByteStringLine( aDFA.GetStyleName(),
RTL_TEXTENCODING_UTF8 );
aFontAttributes[ aFontFileURL ] = aDFA;
}
@@ -188,16 +188,16 @@ ImplFontAttrCache::~ImplFontAttrCache()
const String rFontFileURL( (*aIter).first );
const ImplDevFontAttributes rDFA( (*aIter).second );
write_lenPrefixed_uInt8s_FromOUStringsal_uInt16(aCacheFile,
rFontFileURL, RTL_TEXTENCODING_UTF8);
-write_lenPrefixed_uInt8s_FromOUStringsal_uInt16(aCacheFile,
rDFA.maName, RTL_TEXTENCODING_UTF8);
+write_lenPrefixed_uInt8s_FromOUStringsal_uInt16(aCacheFile,
rDFA.GetFamilyName(), RTL_TEXTENCODING_UTF8);
-aCacheFile static_castshort(rDFA.meWeight);
-aCacheFile static_castshort(rDFA.meItalic);
-aCacheFile static_castshort(rDFA.mePitch);
-aCacheFile static_castshort(rDFA.meWidthType);
-aCacheFile static_castshort(rDFA.meFamily);
-aCacheFile static_castshort(rDFA.mbSymbolFlag != false);
+aCacheFile static_castshort(rDFA.GetWeight());
+aCacheFile static_castshort(rDFA.GetSlant());
+aCacheFile static_castshort(rDFA.GetPitch());
+aCacheFile static_castshort(rDFA.GetWidthType());
+aCacheFile static_castshort(rDFA.GetFamilyType());
+aCacheFile static_castshort(rDFA.IsSymbolFont() != false);
-write_lenPrefixed_uInt8s_FromOUStringsal_uInt16(aCacheFile,
rDFA.maStyleName, RTL_TEXTENCODING_UTF8);
+write_lenPrefixed_uInt8s_FromOUStringsal_uInt16(aCacheFile,
rDFA.GetStyleName(), RTL_TEXTENCODING_UTF8);
++aIter;
}
@@ -230,7 +230,7 @@ ImplDevFontAttributes ImplFontAttrCache::GetFontAttr( const
String rFontFileNam
void ImplFontAttrCache::AddFontAttr( const String rFontFileName, const
ImplDevFontAttributes rDFA )
{
DBG_ASSERT( rFontFileName.Len() rDFA.maName.Len(),
ImplFontNameCache::AddFontName - invalid data! );
-if ( rFontFileName.Len() rDFA.maName.Len() )
+if ( rFontFileName.Len() rDFA.GetFamilyName().Len() )
{
aFontAttributes.insert( FontAttrMap::value_type( OptimizeURL(
rFontFileName ), rDFA ) );
bModified = TRUE;
@@ -574,8 +574,8 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute(
FontSelectPattern rFon
// are the missing characters symbols?
pDevFont = pDevFontList-ImplFindByAttributes( IMPL_FONT_ATTR_SYMBOL,
-rFontSelData.meWeight, rFontSelData.meWidthType,
-rFontSelData.meItalic, rFontSelData.maSearchName );
+rFontSelData.GetWeight(), rFontSelData.GetWidthType(),
+rFontSelData.GetSlant(), rFontSelData.maSearchName );
if( pDevFont )
{
const PhysicalFontFace* pFace = pDevFont-FindBestFontFace(
rFontSelData );
@@ -599,7 +599,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute(
FontSelectPattern rFon
const PhysicalFontFace*
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salgdi3.cxx | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) New commits: commit d7fbc4ad10c954e8705716721018edf546862a46 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Jan 7 15:23:28 2013 +0100 further windows build fix for vcl changes Caused by 1e1ba8611fb134fb693354daae8931e93e46124c and not fixed in 83f684c86c22df40ff1ef5fe7dc4b829a66c2645. Change-Id: I43853f1d933a70789c4b89a22d06d2d383493758 diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 69a05ee..d533181 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -165,7 +165,9 @@ ImplFontAttrCache::ImplFontAttrCache( const String rFileNameURL, const String aCacheFile n; aDFA.SetFamilyType(static_castFontFamily(n)); aCacheFile n; aDFA.SetSymbolFlag(n != 0); -aCacheFile.ReadByteStringLine( aDFA.GetStyleName(), RTL_TEXTENCODING_UTF8 ); +String styleName; +aCacheFile.ReadByteStringLine( styleName, RTL_TEXTENCODING_UTF8 ); +aDFA.SetStyleName( styleName ); aFontAttributes[ aFontFileURL ] = aDFA; } @@ -904,7 +906,7 @@ static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXW rE aDFA.SetSymbolFlag(rLogFont.lfCharSet == SYMBOL_CHARSET); // get the font face name -aDFA.SetFamilyName(reinterpret_castconst sal_Unicode*(rLogFont.lfFaceName)); +aDFA.SetFamilyName( String().Assign(reinterpret_castconst sal_Unicode*(rLogFont.lfFaceName))); // use the face's style name only if it looks reasonable const wchar_t* pStyleName = rEnumFont.elfStyle; @@ -914,7 +916,7 @@ static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXW rE if( *p 0x0020 ) break; if( p pEnd ) -aDFA.SetStyleName(reinterpret_castconst sal_Unicode*(pStyleName)); +aDFA.SetStyleName( String().Assign(reinterpret_castconst sal_Unicode*(pStyleName))); // get device specific font attributes aDFA.mbOrientation = (nFontType RASTER_FONTTYPE) == 0; @@ -1679,7 +1681,7 @@ void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe wchar_t aFaceName[LF_FACESIZE+60]; if( ::GetTextFaceW( mhDC, sizeof(aFaceName)/sizeof(wchar_t), aFaceName ) ) -pMetric-SetFamilyName(reinterpret_castconst sal_Unicode*(aFaceName)); +pMetric-SetFamilyName( String().Assign( reinterpret_castconst sal_Unicode*(aFaceName))); // get the font metric TEXTMETRICA aWinMetric; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salgdi3.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4b4ca80c6b2b950d109c1c2ccea289de7a92b725
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Jan 7 17:00:55 2013 +0200
More ImplFontAttributes change fallout, in --enable-dbgutil code
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index d533181..a410028 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -231,7 +231,7 @@ ImplDevFontAttributes ImplFontAttrCache::GetFontAttr( const
String rFontFileNam
void ImplFontAttrCache::AddFontAttr( const String rFontFileName, const
ImplDevFontAttributes rDFA )
{
-DBG_ASSERT( rFontFileName.Len() rDFA.maName.Len(),
ImplFontNameCache::AddFontName - invalid data! );
+DBG_ASSERT( rFontFileName.Len() rDFA.GetFamilyName().Len(),
ImplFontNameCache::AddFontName - invalid data! );
if ( rFontFileName.Len() rDFA.GetFamilyName().Len() )
{
aFontAttributes.insert( FontAttrMap::value_type( OptimizeURL(
rFontFileName ), rDFA ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salgdi3.cxx |4 ++--
vcl/win/source/window/salframe.cxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d98e8a22a0acf6468614e99da7192894ca7f06d7
Author: Eike Rathke er...@redhat.com
Date: Thu Nov 22 13:05:23 2012 +0100
AllSettings LanguageTag also in win-only files
Change-Id: I7a64a3d582d064608583a80d206745a77f474cfa
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 134c1a3..597df76 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -419,7 +419,7 @@ LanguageType MapCharToLanguage( sal_UCS4 uChar )
// TODO: use the default-CJK language selected in
// Tools-Options-LangSettings-Languages when it becomes available
here
if( !nDefaultLang )
-nDefaultLang = Application::GetSettings().GetUILanguage();
+nDefaultLang =
Application::GetSettings().GetUILanguageTag().getLanguageType();
LanguageType nDefaultCJK = MsLangId::isCJK(nDefaultLang) ?
nDefaultLang : LANGUAGE_CHINESE;
@@ -555,7 +555,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute(
FontSelectPattern rFon
// fall back to default UI locale if the missing characters are
inconclusive
if( eLang == LANGUAGE_DONTKNOW )
-aLocale = Application::GetSettings().GetUILocale();
+aLocale = Application::GetSettings().GetUILanguageTag().getLocale();
// first level fallback:
// try use the locale specific default fonts defined in VCL.xcu
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index 4fb8e6c..bffd400 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2867,7 +2867,7 @@ void WinSalFrame::UpdateSettings( AllSettings rSettings )
aStyleSettings.SetIconFont( aIconFont );
// We prefer Arial in the russian version, because MS Sans Serif
// is to wide for the dialogs
-if ( rSettings.GetLanguage() == LANGUAGE_RUSSIAN )
+if ( rSettings.GetLanguageTag().getLanguageType() == LANGUAGE_RUSSIAN )
{
XubString aFontName = aAppFont.GetName();
XubString aFirstName = aFontName.GetToken( 0, ';' );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salgdi3.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 7752d65999fd64454deb259ef134456e0bb4709f Author: Eike Rathke er...@redhat.com Date: Tue Nov 20 17:33:33 2012 +0100 use LanguageTag Change-Id: Ia5d328b995460f11602f3a1e4d49946d10dfad73 diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 7becdba..134c1a3 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -28,6 +28,7 @@ #include rtl/bootstrap.hxx #include i18npool/mslangid.hxx +#include i18npool/languagetag.hxx #include osl/module.h #include osl/file.hxx @@ -548,7 +549,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern rFon eLang = MapCharToLanguage( uChar ); if( eLang == LANGUAGE_DONTKNOW ) continue; -MsLangId::convertLanguageToLocale( eLang, aLocale ); +aLocale = LanguageTag( eLang ).getLocale(); break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/winlayout.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 9a320f283f32f421e7fd14c030dbba2ad981d05f Author: Eike Rathke er...@redhat.com Date: Tue Nov 20 17:38:31 2012 +0100 use LanguageTag Change-Id: I5fe231f26d29dbab214d414790936b2b484c2fe6 diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index b7929c9..03e59a0 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -51,7 +51,7 @@ typedef boost::unordered_mapint,int IntMap; // Graphite headers #ifdef ENABLE_GRAPHITE -#include i18npool/mslangid.hxx +#include i18npool/languagetag.hxx #include graphite_layout.hxx #include graphite_features.hxx #endif @@ -2737,7 +2737,8 @@ GraphiteWinLayout::GraphiteWinLayout(HDC hDC, const ImplWinFontData rWFD, ImplW mpFont = gr_make_font_with_advance_fn(static_castfloat(-aLogFont.lfHeight), hDC, gr_fontAdvance, rWFD.GraphiteFace()); maImpl.SetFont(mpFont); -const rtl::OString aLang = MsLangId::convertLanguageToIsoByteString( rWFE.maFontSelData.meLanguage ); +const rtl::OString aLang = OUStringToOString( LanguageTag( rWFE.maFontSelData.meLanguage ).getBcp47(), +RTL_TEXTENCODING_ASCII_US); rtl::OString name = rtl::OUStringToOString( rWFE.maFontSelData.maTargetName, RTL_TEXTENCODING_UTF8 ); sal_Int32 nFeat = name.indexOf(grutils::GrFeatureParser::FEAT_PREFIX) + 1; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salnativewidgets-luna.cxx | 18 ++
1 file changed, 14 insertions(+), 4 deletions(-)
New commits:
commit 18ad2ef60ec192089dd5ac9a01e0ccefc8207c7d
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Nov 15 18:48:52 2012 +0100
Windows: Draw the horizontal line between the toolbar and view shell again.
This is necessary after I have removed the 'special' border of the view
shell.
Change-Id: Ie29d60fbff0c6c38ed285ba30eb948ef83c43827
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index abb6f48..f61ba64 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -456,12 +456,13 @@ void impl_drawAeroToolbar( HDC hDC, RECT rc, bool
bHorizontal )
const long GRADIENT_HEIGHT = 32;
long gradient_break = rc.top;
+long gradient_bottom = rc.bottom - 1;
GRADIENT_RECT g_rect[1] = { { 0, 1 } };
// very slow gradient at the top (if we have space for that)
-if ( rc.bottom - rc.top GRADIENT_HEIGHT )
+if ( gradient_bottom - rc.top GRADIENT_HEIGHT )
{
-gradient_break = rc.bottom - GRADIENT_HEIGHT;
+gradient_break = gradient_bottom - GRADIENT_HEIGHT;
TRIVERTEX vert[2] = {
{ rc.left, rc.top, 0xff00, 0xff00, 0xff00, 0xff00 },
@@ -472,10 +473,19 @@ void impl_drawAeroToolbar( HDC hDC, RECT rc, bool
bHorizontal )
// gradient at the bottom
TRIVERTEX vert[2] = {
-{ rc.left, gradient_break, 0xfa00, 0xfa00, 0xfa00, 0xff00 },
-{ rc.right, rc.bottom, 0xf000, 0xf000, 0xf000, 0xff00 }
+{ rc.left, gradient_break, 0xfa00, 0xfa00, 0xfa00, 0xff00 },
+{ rc.right, gradient_bottom, 0xf000, 0xf000, 0xf000, 0xff00 }
};
GradientFill( hDC, vert, 2, g_rect, 1, GRADIENT_FILL_RECT_V );
+
+// and a darker horizontal line under that
+HPEN hpen = CreatePen( PS_SOLID, 1, RGB( 0xa0, 0xa0, 0xa0 ) );
+SelectObject( hDC, hpen );
+
+MoveToEx( hDC, rc.left, gradient_bottom, NULL );
+LineTo( hDC, rc.right, gradient_bottom );
+
+DeleteObject( hpen );
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salnativewidgets-luna.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit c02d3ac6a49533108d7649cd9edc37f4bafb90f5 Author: Jan Holesovsky ke...@suse.cz Date: Thu Nov 8 10:50:51 2012 +0100 Windows: Enable nicer toolbars even for XP, not only Vista and higher. Change-Id: I26837290d1416637032d2dfcfa45b4003c874309 diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 5ba45ab..abb6f48 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -1466,6 +1466,9 @@ void WinSalGraphics::updateSettingsNative( AllSettings rSettings ) StyleSettings aStyleSettings = rSettings.GetStyleSettings(); ImplSVData* pSVData = ImplGetSVData(); +// don't draw frame around each and every toolbar +pSVData-maNWFData.mbDockingAreaAvoidTBFrames = true; + // check if vista or newer runs // in Aero theme (and similar ?) the menu text color does not change // for selected items; also on WinXP and earlier menus are not themed @@ -1478,9 +1481,6 @@ void WinSalGraphics::updateSettingsNative( AllSettings rSettings ) pSVData-maNWFData.mnMenuFormatBorderY = 2; pSVData-maNWFData.maMenuBarHighlightTextColor = aStyleSettings.GetMenuTextColor(); GetSalData()-mbThemeMenuSupport = TRUE; - -// don't draw frame around each and every toolbar -pSVData-maNWFData.mbDockingAreaAvoidTBFrames = true; } rSettings.SetStyleSettings( aStyleSettings ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salnativewidgets-luna.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 5b47653cc871da19a68f9bdedf0c99cff65e739e Author: Ivan Timofeev timofeev@gmail.com Date: Mon Oct 15 21:22:49 2012 +0400 fdo#43714: for a checkmark use the same rect as for its background Change-Id: Ib8833477eb20b658dde1ea2a78cb0bee0c24241a diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 8c343fe..0cd8d41 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -1087,6 +1087,7 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, aBGRect.right = rMVal.getNumericVal(); aBGRect.left = rMVal.maItemRect.Left(); } +rc = aBGRect; } iState = (nState CTRL_STATE_ENABLED) ? MCB_NORMAL : MCB_DISABLED; ImplDrawTheme( hTheme, hDC, MENU_POPUPCHECKBACKGROUND, iState, aBGRect, aCaption ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salgdi3.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 065596f57690f7dda6dcd00ba7871a335d49c458 Author: Muthu Subramanian sumu...@suse.com Date: Wed Jul 11 14:16:11 2012 +0530 Adding helpers.hxx for FRound() diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 963ea3a..81ad69b 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -56,6 +56,7 @@ #include tools/poly.hxx #include tools/debug.hxx #include tools/stream.hxx +#include tools/helpers.hxx #include vcl/sysdata.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salnativewidgets-luna.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6ce4e0a263f3dfe86eccc8f750f57364ed612a4a
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Jun 26 16:48:19 2012 +0200
aero toolbar: Use f0f0f0 for the gradient again, it was reverted by
accident.
Change-Id: I05435615185f05ec3fd9609f039394f4ecb03def
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index ded121d..b8abaee 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -482,7 +482,7 @@ void impl_drawAeroToolbar( HDC hDC, RECT rc )
// gradient at the bottom
TRIVERTEX vert[2] = {
{ rc.left, gradient_break, 0xfa00, 0xfa00, 0xfa00, 0xff00 },
-{ rc.right, rc.bottom, 0xe500, 0xe900, 0xee00, 0xff00 }
+{ rc.right, rc.bottom, 0xf000, 0xf000, 0xf000, 0xff00 }
};
GradientFill( hDC, vert, 2, g_rect, 1, GRADIENT_FILL_RECT_V );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/window/salobj.cxx | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 44e52d6698742edc8295bdcb7ad06ff370e5e6a6
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu May 10 21:26:05 2012 +0300
fdo#45081: We never registered the SAL_OBJECT_CHILDCLASSNAMEA window class
A crucial line of code that called RegisterClassExA() for that window
class had been deleted by accident in commit
cda4a293608514783d38d470799cfbf97b245cc6 Code cleanup in May 2011,
whoa. So apparently that window class is not needed for much except
embedded video in Impress?
Change-Id: I I19e70cefcf47aaf8a12a62539e0dacc5adb3c3b1
diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx
index e91ca8d..cbaef77 100644
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.cxx
@@ -559,7 +559,8 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst,
WinSalFrame* pParent )
aWndClassEx.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
aWndClassEx.lpfnWndProc = SalSysObjChildWndProcA;
aWndClassEx.lpszClassName = SAL_OBJECT_CHILDCLASSNAMEA;
-pSalData-mbObjClassInit = TRUE;
+if ( RegisterClassExA( aWndClassEx ) )
+pSalData-mbObjClassInit = TRUE;
}
}
@@ -593,6 +594,15 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst,
WinSalFrame* pParent )
if ( !hWndChild )
{
+#if OSL_DEBUG_LEVEL 1
+char *msg = NULL;
+FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER
+ |FORMAT_MESSAGE_IGNORE_INSERTS
+ |FORMAT_MESSAGE_FROM_SYSTEM,
+ NULL, GetLastError(), 0,
+ (LPSTR) msg, 0, NULL);
+MessageBoxA(NULL, msg, CreateWindowExA failed, MB_OK);
+#endif
delete pObject;
return NULL;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/app/salinst.cxx |2 --
vcl/win/source/app/salshl.cxx |4
vcl/win/source/gdi/salgdi3.cxx |5 -
3 files changed, 11 deletions(-)
New commits:
commit a4d77bafb6211481acd4e4b633639ec6bf3f25a3
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed May 9 13:45:58 2012 +0300
This is Windows code so bin pointless #ifdef WNT
Change-Id: I8e81ecd0e78f22f09db4288b781ae5f5da4d8760
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index be70008..e80ff80 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -28,10 +28,8 @@
#include string.h
-#ifdef WNT
#include svsys.h
#include process.h
-#endif
#include osl/file.hxx
#include osl/mutex.hxx
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index 8e7c0b9..486ce04 100644
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.cxx
@@ -37,8 +37,6 @@ SalShlData aSalShlData;
// ===
-#ifdef WNT
-
extern C
{
@@ -73,8 +71,6 @@ BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID
pReserved )
}
-#endif
-
// ===
HCURSOR ImplLoadSalCursor( int nId )
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 79ff375..a22ab47 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -1067,16 +1067,11 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW
rLogFont, Font rFont )
static FILE * grLogFile = NULL;
static FILE * grLog()
{
-#ifdef WNT
std::string logFileName(getenv(TEMP));
logFileName.append(\\grface.log);
if (grLogFile == NULL) grLogFile = fopen(logFileName.c_str(),w);
else fflush(grLogFile);
return grLogFile;
-#else
-fflush(stdout);
-return stdout;
-#endif
}
#undef NDEBUG
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/winlayout.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f21316fbf0176ee23999504ce03917caac190cb3
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed May 9 18:20:23 2012 +0200
conversion to void* needs an explicit cast
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 72f9cf3..b2a24a7 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -1081,7 +1081,7 @@ static bool InitUSP()
{
// get the usp10.dll version info
HMODULE usp10 = ::GetModuleHandle(usp10.dll);
-void *pScriptIsComplex = ::GetProcAddress(usp10, ScriptIsComplex);
+void *pScriptIsComplex = reinterpret_cast void* (
::GetProcAddress(usp10, ScriptIsComplex));
int nUspVersion = 0;
rtl_uString* pModuleURL = NULL;
osl_getModuleURLFromAddress( pScriptIsComplex, pModuleURL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salnativewidgets-luna.cxx | 10 ++ 1 file changed, 10 insertions(+) New commits: commit f0e68c48b95e223704d51257f6c767204d6b63c0 Author: Jan Holesovsky ke...@suse.cz Date: Mon May 7 17:52:16 2012 +0200 Add some useful links to the Windows theming. Change-Id: I2ced06de50b145ab9a876679f1ec49dd8915fbf9 diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 888b1a7..1f684b8 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -26,6 +26,16 @@ * / +// General info: +// http://msdn.microsoft.com/en-us/library/windows/desktop/hh270423%28v=vs.85%29.aspx +// http://msdn.microsoft.com/en-us/library/windows/desktop/bb773178%28v=vs.85%29.aspx +// +// Useful tool to explore the themes their rendering: +// http://privat.rejbrand.se/UxExplore.exe +// (found at http://stackoverflow.com/questions/4009701/windows-visual-themes-gallery-of-parts-and-states/4009712#4009712) +// +// Theme subclasses: +// http://msdn.microsoft.com/en-us/library/windows/desktop/bb773218%28v=vs.85%29.aspx #define _SV_SALNATIVEWIDGETS_CXX ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/window/salframe.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 05597378a1f8aa5ff691d7e4b61cdb70b797cb6a
Author: Jan Holesovsky ke...@suse.cz
Date: Mon May 7 18:19:37 2012 +0200
Added a fixme.
Change-Id: I303a750058039a4df5a237c823178c8a065f04a4
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index 3cb870b..aae5999 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2704,6 +2704,10 @@ static HRESULT WINAPI
backwardCompatibleDwmIsCompositionEnabled( BOOL* pOut )
static BOOL ImplDwmIsCompositionEnabled()
{
+// FIXME It seems that this wrong advice to use 'DwmIsCompositionEnabled'
+// is widely spread; causing LO to not theme menus when running in
+// rdesktop. We should beter use IsThemeActive() from uxtheme.dll.
+// But the entire ::UpdateSettings() need a rework anyway ;-)
SalData* pSalData = GetSalData();
if( ! pSalData-mpDwmIsCompositionEnabled )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salnativewidgets-luna.cxx | 18 +++---
1 file changed, 15 insertions(+), 3 deletions(-)
New commits:
commit a4cc4d3ec982ac61100b337125983afa0bb6fbc3
Author: Ivan Timofeev timofeev@gmail.com
Date: Wed Apr 11 21:34:06 2012 +0400
vcl: win: fix RTL menu separator and gutter, checkmarks are still misplaced
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 2bc2f4b..bcf80cd 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -984,8 +984,16 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme,
RECT rc,
if( nPart == PART_ENTIRE_CONTROL )
{
RECT aGutterRC = rc;
-aGutterRC.left += aValue.getNumericVal();
-aGutterRC.right = aGutterRC.left+3;
+if( Application::GetSettings().GetLayoutRTL() )
+{
+aGutterRC.right -= aValue.getNumericVal();
+aGutterRC.left = aGutterRC.right-3;
+}
+else
+{
+aGutterRC.left += aValue.getNumericVal();
+aGutterRC.right = aGutterRC.left+3;
+}
return
ImplDrawTheme( hTheme, hDC, MENU_POPUPBACKGROUND, 0, rc,
aCaption )
ImplDrawTheme( hTheme, hDC, MENU_POPUPGUTTER, 0, aGutterRC,
aCaption )
@@ -1028,7 +1036,11 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme,
RECT rc,
}
else if( nPart == PART_MENU_SEPARATOR )
{
-rc.left += aValue.getNumericVal(); // adjust for gutter
position
+// adjust for gutter position
+if( Application::GetSettings().GetLayoutRTL() )
+rc.right -= aValue.getNumericVal();
+else
+rc.left += aValue.getNumericVal();
Rectangle aRect( ImplGetThemeRect( hTheme, hDC,
MENU_POPUPSEPARATOR, 0, Rectangle( rc.left, rc.top,
rc.right, rc.bottom ) ) );
// center the separator inside the passed rectangle
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salgdi3.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1613a4949fae679365996db2781c1fb26df9279f
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Mar 13 11:27:49 2012 +0100
fix compile
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 3e24d75..674567d 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -551,7 +551,7 @@ namespace
const com::sun::star::lang::Locale rLocale )
{
// get the default font for a specified locale
-const DefaultFontConfiguration rDefaults =
DefaultFontConfiguration::get();
+const DefaultFontConfiguration rDefaults =
utl::DefaultFontConfiguration::get();
const rtl::OUString aDefault = rDefaults.getUserInterfaceFont(rLocale);
return rDevFontList.ImplFindByTokenNames(aDefault);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/app/saldata.cxx | 10 +-
vcl/win/source/app/salinfo.cxx |8
vcl/win/source/app/salinst.cxx | 16
3 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 37c198cf098976d4b6814017f3ac1a81b53d2fb5
Author: Jesús Corrius je...@softcatala.org
Date: Thu Feb 2 09:54:00 2012 +0100
Revert Win32 API calls use the Unicode versions by default
This reverts commit 157a32f0dc2eaa195ff60e8b60902554e73e999f. The patch is
good but it breaks the MinGW build because the compiler is misconfigured and by
default the API calls there are ANSI.
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 617b03f..4445315 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -93,35 +93,35 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const
char* pStr2 )
BOOL ImplPostMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
{
-return PostMessage( hWnd, nMsg, wParam, lParam );
+return PostMessageW( hWnd, nMsg, wParam, lParam );
}
// ---
BOOL ImplSendMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
{
-return SendMessage( hWnd, nMsg, wParam, lParam );
+return SendMessageW( hWnd, nMsg, wParam, lParam );
}
// ---
BOOL ImplGetMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT
wMsgFilterMax )
{
-return GetMessage( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax );
+return GetMessageW( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax );
}
// ---
BOOL ImplPeekMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT
wMsgFilterMax, UINT wRemoveMsg )
{
-return PeekMessage( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg
);
+return PeekMessageW( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg
);
}
// ---
LONG ImplDispatchMessage( CONST MSG *lpMsg )
{
-return DispatchMessage( lpMsg );
+return DispatchMessageW( lpMsg );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index d370589..efd4d08 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -67,9 +67,9 @@ static BOOL CALLBACK ImplEnumMonitorProc( HMONITOR hMonitor,
sal_Bool WinSalSystem::handleMonitorCallback( sal_IntPtr hMonitor, sal_IntPtr,
sal_IntPtr )
{
-MONITORINFOEX aInfo;
+MONITORINFOEXW aInfo;
aInfo.cbSize = sizeof( aInfo );
-if( GetMonitorInfo( reinterpret_castHMONITOR(hMonitor), aInfo ) )
+if( GetMonitorInfoW( reinterpret_castHMONITOR(hMonitor), aInfo ) )
{
aInfo.szDevice[CCHDEVICENAME-1] = 0;
rtl::OUString aDeviceName( reinterpret_castconst sal_Unicode
*(aInfo.szDevice) );
@@ -127,7 +127,7 @@ bool WinSalSystem::initMonitors()
aDev.cb = sizeof( aDev );
DWORD nDevice = 0;
boost::unordered_map rtl::OUString, int, rtl::OUStringHash
aDeviceStringCount;
-while( EnumDisplayDevices( NULL, nDevice++, aDev, 0 ) )
+while( EnumDisplayDevicesW( NULL, nDevice++, aDev, 0 ) )
{
if( (aDev.StateFlags DISPLAY_DEVICE_ACTIVE)
!(aDev.StateFlags DISPLAY_DEVICE_MIRRORING_DRIVER) ) //
sort out non/disabled monitors
@@ -236,7 +236,7 @@ int WinSalSystem::ShowNativeMessageBox(const rtl::OUString
rTitle, const rtl::O
nFlags |=
DEFAULT_BTN_MAPPING_TABLE[nButtonCombination][nDefaultButton];
ImplHideSplash();
-return MessageBox(
+return MessageBoxW(
0,
reinterpret_castLPCWSTR(rMessage.getStr()),
reinterpret_castLPCWSTR(rTitle.getStr()),
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index c75ee06..d491404 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -89,13 +89,13 @@ void SalAbort( const rtl::OUString rErrorText, bool )
{
// make sure crash reporter is triggered
RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL );
-FatalAppExit( 0, LApplication Error );
+FatalAppExitW( 0, LApplication Error );
}
else
{
// make sure crash reporter is triggered
RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL );
-FatalAppExit( 0, rErrorText.getStr() );
+FatalAppExitW( 0, rErrorText.getStr() );
}
}
@@ -521,32 +521,32 @@ SalInstance* CreateSalInstance()
aWndClassEx.lpszMenuName= 0;
aWndClassEx.lpszClassName = SAL_FRAME_CLASSNAMEW;
ImplLoadSalIcon( SAL_RESID_ICON_DEFAULT, aWndClassEx.hIcon,
aWndClassEx.hIconSm );
-if ( !RegisterClassEx( aWndClassEx ) )
+if ( !RegisterClassExW( aWndClassEx ) )
[Libreoffice-commits] .: vcl/win
vcl/win/source/app/salinst.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 244899285bfc515cca0a323f4aecf06b00342848
Author: Jesús Corrius je...@softcatala.org
Date: Thu Feb 2 12:00:02 2012 +0100
Try to fix the MinGW build with a simple solution
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index d491404..be70008 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -95,7 +95,7 @@ void SalAbort( const rtl::OUString rErrorText, bool )
{
// make sure crash reporter is triggered
RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL );
-FatalAppExitW( 0, rErrorText.getStr() );
+FatalAppExitW( 0, reinterpret_castLPCWSTR(rErrorText.getStr()) );
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/app/salinst.cxx |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 56549a939cdf3a2510bbdba21b72632a4f238cf5
Author: Andras Timar ati...@suse.com
Date: Wed Feb 1 15:56:34 2012 +0100
ByteString - OUString
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index d0a6bd0..d491404 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -87,16 +87,15 @@ void SalAbort( const rtl::OUString rErrorText, bool )
if ( rErrorText.isEmpty() )
{
-// #112255# make sure crash reporter is triggered
+// make sure crash reporter is triggered
RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL );
-FatalAppExit( 0, Application Error );
+FatalAppExitW( 0, LApplication Error );
}
else
{
-// #112255# make sure crash reporter is triggered
+// make sure crash reporter is triggered
RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL );
-ByteString aErrorText( ImplSalGetWinAnsiString( rErrorText ) );
-FatalAppExit( 0, aErrorText.GetBuffer() );
+FatalAppExitW( 0, rErrorText.getStr() );
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/window/salframe.cxx |6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit e1e8bd19a6acf5526f6bb3d9006ecb37ff01c89d
Author: Andras Timar ati...@suse.com
Date: Wed Feb 1 16:00:59 2012 +0100
kill ByteString by dropping support of Win9x
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index 6c8dce8..c21f95b 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -1107,11 +1107,7 @@ void WinSalFrame::SetTitle( const rtl::OUString rTitle )
{
DBG_ASSERT( sizeof( WCHAR ) == sizeof( xub_Unicode ),
WinSalFrame::SetTitle(): WCHAR != sal_Unicode );
-if ( !SetWindowTextW( mhWnd, reinterpret_castLPCWSTR(rTitle.getStr()) ) )
-{
-ByteString aAnsiTitle = ImplSalGetWinAnsiString( rTitle );
-SetWindowTextA( mhWnd, aAnsiTitle.GetBuffer() );
-}
+SetWindowTextW( mhWnd, reinterpret_castLPCWSTR(rTitle.getStr()) )
}
// ---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/app/saldata.cxx | 10 +-
vcl/win/source/app/salinfo.cxx |8
vcl/win/source/app/salinst.cxx | 16
3 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 157a32f0dc2eaa195ff60e8b60902554e73e999f
Author: Jesús Corrius je...@softcatala.org
Date: Thu Feb 2 00:09:53 2012 +0100
Win32 API calls use the Unicode versions by default
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 4445315..617b03f 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -93,35 +93,35 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const
char* pStr2 )
BOOL ImplPostMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
{
-return PostMessageW( hWnd, nMsg, wParam, lParam );
+return PostMessage( hWnd, nMsg, wParam, lParam );
}
// ---
BOOL ImplSendMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
{
-return SendMessageW( hWnd, nMsg, wParam, lParam );
+return SendMessage( hWnd, nMsg, wParam, lParam );
}
// ---
BOOL ImplGetMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT
wMsgFilterMax )
{
-return GetMessageW( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax );
+return GetMessage( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax );
}
// ---
BOOL ImplPeekMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT
wMsgFilterMax, UINT wRemoveMsg )
{
-return PeekMessageW( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg
);
+return PeekMessage( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg
);
}
// ---
LONG ImplDispatchMessage( CONST MSG *lpMsg )
{
-return DispatchMessageW( lpMsg );
+return DispatchMessage( lpMsg );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index efd4d08..d370589 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -67,9 +67,9 @@ static BOOL CALLBACK ImplEnumMonitorProc( HMONITOR hMonitor,
sal_Bool WinSalSystem::handleMonitorCallback( sal_IntPtr hMonitor, sal_IntPtr,
sal_IntPtr )
{
-MONITORINFOEXW aInfo;
+MONITORINFOEX aInfo;
aInfo.cbSize = sizeof( aInfo );
-if( GetMonitorInfoW( reinterpret_castHMONITOR(hMonitor), aInfo ) )
+if( GetMonitorInfo( reinterpret_castHMONITOR(hMonitor), aInfo ) )
{
aInfo.szDevice[CCHDEVICENAME-1] = 0;
rtl::OUString aDeviceName( reinterpret_castconst sal_Unicode
*(aInfo.szDevice) );
@@ -127,7 +127,7 @@ bool WinSalSystem::initMonitors()
aDev.cb = sizeof( aDev );
DWORD nDevice = 0;
boost::unordered_map rtl::OUString, int, rtl::OUStringHash
aDeviceStringCount;
-while( EnumDisplayDevicesW( NULL, nDevice++, aDev, 0 ) )
+while( EnumDisplayDevices( NULL, nDevice++, aDev, 0 ) )
{
if( (aDev.StateFlags DISPLAY_DEVICE_ACTIVE)
!(aDev.StateFlags DISPLAY_DEVICE_MIRRORING_DRIVER) ) //
sort out non/disabled monitors
@@ -236,7 +236,7 @@ int WinSalSystem::ShowNativeMessageBox(const rtl::OUString
rTitle, const rtl::O
nFlags |=
DEFAULT_BTN_MAPPING_TABLE[nButtonCombination][nDefaultButton];
ImplHideSplash();
-return MessageBoxW(
+return MessageBox(
0,
reinterpret_castLPCWSTR(rMessage.getStr()),
reinterpret_castLPCWSTR(rTitle.getStr()),
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index d491404..c75ee06 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -89,13 +89,13 @@ void SalAbort( const rtl::OUString rErrorText, bool )
{
// make sure crash reporter is triggered
RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL );
-FatalAppExitW( 0, LApplication Error );
+FatalAppExit( 0, LApplication Error );
}
else
{
// make sure crash reporter is triggered
RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL );
-FatalAppExitW( 0, rErrorText.getStr() );
+FatalAppExit( 0, rErrorText.getStr() );
}
}
@@ -521,32 +521,32 @@ SalInstance* CreateSalInstance()
aWndClassEx.lpszMenuName= 0;
aWndClassEx.lpszClassName = SAL_FRAME_CLASSNAMEW;
ImplLoadSalIcon( SAL_RESID_ICON_DEFAULT, aWndClassEx.hIcon,
aWndClassEx.hIconSm );
-if ( !RegisterClassExW( aWndClassEx ) )
+if ( !RegisterClassEx( aWndClassEx ) )
return NULL;
aWndClassEx.hIcon = 0;
aWndClassEx.hIconSm = 0;
aWndClassEx.style |= CS_SAVEBITS;
aWndClassEx.lpszClassName =
[Libreoffice-commits] .: vcl/win
vcl/win/source/window/salframe.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 54d278ae5feea82d105e4bd11d554ad5fcb41099
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date: Thu Feb 2 09:44:10 2012 +0700
missing semicolon
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index c21f95b..6a2a16f 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -1107,7 +1107,7 @@ void WinSalFrame::SetTitle( const rtl::OUString rTitle )
{
DBG_ASSERT( sizeof( WCHAR ) == sizeof( xub_Unicode ),
WinSalFrame::SetTitle(): WCHAR != sal_Unicode );
-SetWindowTextW( mhWnd, reinterpret_castLPCWSTR(rTitle.getStr()) )
+SetWindowTextW( mhWnd, reinterpret_castLPCWSTR(rTitle.getStr()) );
}
// ---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/app/salinst.cxx | 23 +++
1 file changed, 3 insertions(+), 20 deletions(-)
New commits:
commit 6c779863bbd25499f4c7dff7d201403ebef898be
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jan 30 19:00:00 2012 +0100
Fix Found duplicate branches for if and else
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index bf1b89f..196b013 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -332,27 +332,10 @@ bool WinSalInstance::CheckYieldMutex()
bool bRet = true;
SalData*pSalData = GetSalData();
DWORD nCurThreadId = GetCurrentThreadId();
-if ( pSalData-mnAppThreadId != nCurThreadId )
-{
-if ( pSalData-mpFirstInstance )
-{
-SalYieldMutex* pYieldMutex =
pSalData-mpFirstInstance-mpSalYieldMutex;
-if ( pYieldMutex-mnThreadId != nCurThreadId )
-{
-bRet = false;
-}
-}
-}
-else
+if ( pSalData-mpFirstInstance )
{
-if ( pSalData-mpFirstInstance )
-{
-SalYieldMutex* pYieldMutex =
pSalData-mpFirstInstance-mpSalYieldMutex;
-if ( pYieldMutex-mnThreadId != nCurThreadId )
-{
-bRet = false;
-}
-}
+SalYieldMutex* pYieldMutex =
pSalData-mpFirstInstance-mpSalYieldMutex;
+bRet = (pYieldMutex-mnThreadId == nCurThreadId);
}
return bRet;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/app/salinst.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 9b6cb7319e46a2da6f5d3e3f748f103cb508f698
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jan 30 21:16:20 2012 +0100
Just some simplification
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 196b013..d0a6bd0 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -329,15 +329,13 @@ void ImplSalAcquireYieldMutex( sal_uLong nCount )
bool WinSalInstance::CheckYieldMutex()
{
-bool bRet = true;
SalData*pSalData = GetSalData();
-DWORD nCurThreadId = GetCurrentThreadId();
if ( pSalData-mpFirstInstance )
{
SalYieldMutex* pYieldMutex =
pSalData-mpFirstInstance-mpSalYieldMutex;
-bRet = (pYieldMutex-mnThreadId == nCurThreadId);
+return (pYieldMutex-mnThreadId == (GetCurrentThreadId()));
}
-return bRet;
+return true;
}
// ===
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/app/salinfo.cxx |4 ++--
vcl/win/source/gdi/salprn.cxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit e1de8237d5f8d5ac1db3c6eb4567eaffe2e7bd86
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 21 11:01:56 2011 +
these need to be getStr post OUString-ization
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index 9ac68b0..2db9090 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -246,8 +246,8 @@ int WinSalSystem::ShowNativeMessageBox(const rtl::OUString
rTitle, const rtl::O
ImplHideSplash();
return MessageBoxW(
0,
-reinterpret_castLPCWSTR(rMessage.GetBuffer()),
-reinterpret_castLPCWSTR(rTitle.GetBuffer()),
+reinterpret_castLPCWSTR(rMessage.getStr()),
+reinterpret_castLPCWSTR(rTitle.getStr()),
nFlags);
}
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index b8f79d8..0da87bd 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -210,7 +210,7 @@ void WinSalInstance::GetPrinterQueueInfo( ImplPrnQueueList*
pList )
void WinSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo )
{
HANDLE hPrinter = 0;
-LPWSTR pPrnName =
reinterpret_castLPWSTR(const_castsal_Unicode*(pInfo-maPrinterName.GetBuffer()));
+LPWSTR pPrnName =
reinterpret_castLPWSTR(const_castsal_Unicode*(pInfo-maPrinterName.getStr()));
if( OpenPrinterW( pPrnName, hPrinter, NULL ) )
{
DWORD nBytes = 0;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salgdi3.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ce60138d339a5eb2a174a5d27063249acf2cac42
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 21 13:11:46 2011 +
link error
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 58ec98f..71066ac 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2169,7 +2169,7 @@ static int WINAPI __AddFontResourceExW( LPCWSTR
lpszfileName, DWORD fl, PVOID pd
}
#endif
-bool ImplAddTempFont( SalData rSalData, const String rFontFileURL )
+bool ImplAddTempFont( SalData rSalData, const rtl::OUString rFontFileURL )
{
int nRet = 0;
::rtl::OUString aUSytemPath;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salprn.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 96d01c8f07478f4241f014145a64c57b041f0d44 Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Nov 21 14:14:40 2011 +0100 disambiguate (OU)?String comparison into OUString comparison diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index 5f58cb7..bcfc850 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -368,7 +368,7 @@ static sal_Bool ImplTestSalJobSetup( WinSalInfoPrinter* pPrinter, } SalDriverData* pSetupDriverData = (SalDriverData*)(pSetupData-mpDriverData); if ( (pSetupData-mnSystem == JOBSETUP_SYSTEM_WINDOWS) - (pPrinter-maDriverName == pSetupData-maDriver) + (OUString(pPrinter-maDriverName) == pSetupData-maDriver) (pSetupData-mnDriverDataLen sizeof( SalDriverData )) (long)(pSetupData-mnDriverDataLen - pSetupDriverData-mnDriverOffset) == nSysJobSize pSetupDriverData-mnSysSignature == SAL_DRIVERDATA_SYSSIGN ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
