View | Details | Raw Unified | Return to issue 68639
Collapse All | Expand All

(-)file_not_specified_in_diff (-1 / +8 lines)
Line  Link Here
0
-- svx/source/svrtf/svxrtf.cxx
0
++ svx/source/svrtf/svxrtf.cxx
Lines 70-75 Link Here
70
#include "svxrtf.hxx"
70
#include "svxrtf.hxx"
71
#include <svx/svxids.hrc>
71
#include <svx/svxids.hrc>
72
72
73
#ifndef _SV_SVAPP_HXX
74
#include <vcl/svapp.hxx>
75
#endif
76
73
77
74
SV_IMPL_PTRARR( SvxRTFColorTbl, ColorPtr )
78
SV_IMPL_PTRARR( SvxRTFColorTbl, ColorPtr )
75
SV_IMPL_PTRARR( SvxRTFItemStackList, SvxRTFItemStackType* )
79
SV_IMPL_PTRARR( SvxRTFItemStackList, SvxRTFItemStackType* )
Lines 514-519 void SvxRTFParser::ReadFontTable() Link Here
514
	String sAltNm, sFntNm;
518
	String sAltNm, sFntNm;
515
	BOOL bIsAltFntNm = FALSE, bCheckNewFont;
519
	BOOL bIsAltFntNm = FALSE, bCheckNewFont;
516
520
521
    pFont->SetCharSet(Application::GetSettings().GetDefaultTextEncoding());
522
    SetEncoding(Application::GetSettings().GetDefaultTextEncoding());
523
517
	while( _nOpenBrakets && IsParserWorking() )
524
	while( _nOpenBrakets && IsParserWorking() )
518
	{
525
	{
519
		bCheckNewFont = FALSE;
526
		bCheckNewFont = FALSE;
(-)vcl.orig/inc/vcl/settings.hxx (+1 lines)
Lines 1291-1296 Link Here
1291
    const LocaleDataWrapper&                GetUILocaleDataWrapper() const;
1291
    const LocaleDataWrapper&                GetUILocaleDataWrapper() const;
1292
    const vcl::I18nHelper&                  GetLocaleI18nHelper() const;
1292
    const vcl::I18nHelper&                  GetLocaleI18nHelper() const;
1293
    const vcl::I18nHelper&                  GetUILocaleI18nHelper() const;
1293
    const vcl::I18nHelper&                  GetUILocaleI18nHelper() const;
1294
    const CharSet                           GetDefaultTextEncoding() const;
1294
/*
1295
/*
1295
    const CollatorWrapper&                  GetCollatorWrapper() const;
1296
    const CollatorWrapper&                  GetCollatorWrapper() const;
1296
    const CollatorWrapper&                  GetUICollatorWrapper() const;
1297
    const CollatorWrapper&                  GetUICollatorWrapper() const;
(-)vcl.orig/source/app/settings.cxx (+18 lines)
Lines 2120-2125 Link Here
2120
    return *mpData->mpUII18nHelper;
2120
    return *mpData->mpUII18nHelper;
2121
}
2121
}
2122
2122
2123
const CharSet AllSettings::GetDefaultTextEncoding() const
2124
{
2125
    
2126
    ::com::sun::star::lang::Locale aLocale;
2127
    ::rtl::OUString aLangString;
2128
2129
    aLocale = GetLocale();
2130
    aLangString = aLocale.Language;
2131
2132
    if ( aLangString.equals( ::rtl::OUString::createFromAscii( "ru" ) )
2133
      || aLangString.equals( ::rtl::OUString::createFromAscii( "uk" ) ) )
2134
        return RTL_TEXTENCODING_MS_1251;
2135
    if ( aLangString.equals( ::rtl::OUString::createFromAscii( "tr" ) ) )
2136
        return RTL_TEXTENCODING_MS_1254;
2137
    else
2138
        return RTL_TEXTENCODING_MS_1252;
2139
}
2140
2123
2141
2124
// -----------------------------------------------------------------------
2142
// -----------------------------------------------------------------------
2125
/*
2143
/*

Return to issue 68639