[Libreoffice-commits] .: svtools/inc svtools/source unusedcode.easy
svtools/inc/svtools/svmedit.hxx |3 ---
svtools/source/edit/svmedit.cxx | 19 ---
unusedcode.easy |3 ---
3 files changed, 25 deletions(-)
New commits:
commit 0e31821b12f36bd753f35a73fcaba8ede8eb1359
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Thu Feb 16 11:38:04 2012 +
Removed unused functions from MultiLineEdit in svtools module
diff --git a/svtools/inc/svtools/svmedit.hxx b/svtools/inc/svtools/svmedit.hxx
index eb855da..bfce316 100644
--- a/svtools/inc/svtools/svmedit.hxx
+++ b/svtools/inc/svtools/svmedit.hxx
@@ -65,7 +65,6 @@ protected:
ExtTextEngine* GetTextEngine() const;
ExtTextView*GetTextView() const;
-ScrollBar* GetHScrollBar() const;
ScrollBar* GetVScrollBar() const;
public:
@@ -110,7 +109,6 @@ public:
{ SetText( rStr ); SetSelection( rNewSelection ); }
String GetText() const;
String GetText( LineEnd aSeparator ) const;
-String GetTextLines() const;
String GetTextLines( LineEnd aSeparator ) const;
voidSetRightToLeft( sal_Bool bRightToLeft );
@@ -137,7 +135,6 @@ public:
voidDraw( OutputDevice* pDev, const Point rPos, const Size
rSize, sal_uLong nFlags );
void SetLeftMargin( sal_uInt16 n );
-sal_uInt16 GetLeftMargin() const;
virtual
::com::sun::star::uno::Reference ::com::sun::star::awt::XWindowPeer
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index 640f05a..bb5f4b3 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -1215,11 +1215,6 @@ String MultiLineEdit::GetText( LineEnd aSeparator ) const
return pImpSvMEdit-GetText( aSeparator );
}
-String MultiLineEdit::GetTextLines() const
-{
-return pImpSvMEdit-GetTextLines();
-}
-
String MultiLineEdit::GetTextLines( LineEnd aSeparator ) const
{
return pImpSvMEdit-GetTextLines( aSeparator );
@@ -1559,12 +1554,6 @@ ExtTextView* MultiLineEdit::GetTextView() const
return pImpSvMEdit-GetTextWindow()-GetTextView();
}
-ScrollBar* MultiLineEdit::GetHScrollBar() const
-{
-return pImpSvMEdit-GetHScrollBar();
-}
-
-
ScrollBar* MultiLineEdit::GetVScrollBar() const
{
return pImpSvMEdit-GetVScrollBar();
@@ -1581,14 +1570,6 @@ void MultiLineEdit::SetLeftMargin( sal_uInt16 n )
GetTextEngine()-SetLeftMargin( n );
}
-sal_uInt16 MultiLineEdit::GetLeftMargin() const
-{
-if ( GetTextEngine() )
-return GetTextEngine()-GetLeftMargin();
-else
-return 0;
-}
-
void MultiLineEdit::SetRightToLeft( sal_Bool bRightToLeft )
{
if ( GetTextEngine() )
diff --git a/unusedcode.easy b/unusedcode.easy
index 3dd0f66..647b4f3 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -42,9 +42,6 @@ Matrix3d::Inverse() const
Matrix3d::Matrix3d()
MenuBar::MenuBar(ResId const)
MergeData::Dump()
-MultiLineEdit::GetHScrollBar() const
-MultiLineEdit::GetLeftMargin() const
-MultiLineEdit::GetTextLines() const
NfCurrencyEntry::NfCurrencyEntry()
NumberFormatCodeWrapper::getDefault(short, short) const
NumericBox::GetValue(unsigned short) const
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/inc svtools/source unusedcode.easy vcl/inc vcl/source
svtools/inc/svtools/imap.hxx|3 ---
svtools/source/edit/svmedit.cxx |6 --
svtools/source/misc/imap.cxx| 18 --
unusedcode.easy |6 --
vcl/inc/ilstbox.hxx |1 -
vcl/inc/image.h |1 -
vcl/inc/vcl/button.hxx |3 ---
vcl/inc/vcl/settings.hxx|6 --
vcl/source/app/settings.cxx | 12
vcl/source/control/button.cxx |8
vcl/source/control/ilstbox.cxx |7 ---
vcl/source/gdi/impimage.cxx |5 -
12 files changed, 76 deletions(-)
New commits:
commit 3626c2cef7c39bda96e2d3bc0d5a53ba1044aadc
Author: Alexander Bergmann myadd...@gmx.de
Date: Wed Feb 15 13:15:50 2012 +
unusedcode.easy: Removed unused code
diff --git a/svtools/inc/svtools/imap.hxx b/svtools/inc/svtools/imap.hxx
index 9418d98..8d81c00 100644
--- a/svtools/inc/svtools/imap.hxx
+++ b/svtools/inc/svtools/imap.hxx
@@ -132,9 +132,6 @@ public:
const String GetName() const { return aName; }
voidSetName( const String rName ) { aName = rName; }
-// gibt das BoundRect aller IMap-Objekte in 1/100mm zurueck
-Rectangle GetBoundRect() const;
-
// skaliert alle Objekte der ImageMap entpr. dem uebergebenen Faktor
voidScale( const Fraction rFractX, const Fraction rFracY
);
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index 44ad0d1..267a203 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -139,7 +139,6 @@ public:
voidSetMaxTextLen( xub_StrLen nLen );
xub_StrLen GetMaxTextLen() const;
-voidSetInsertMode( sal_Bool bInsert );
sal_BoolIsInsertMode() const;
voidInsertText( const String rStr );
@@ -396,11 +395,6 @@ sal_Bool ImpSvMEdit::IsModified() const
return mpTextWindow-GetTextEngine()-IsModified();
}
-void ImpSvMEdit::SetInsertMode( sal_Bool bInsert )
-{
-mpTextWindow-GetTextView()-SetInsertMode( bInsert );
-}
-
void ImpSvMEdit::SetReadOnly( sal_Bool bRdOnly )
{
mpTextWindow-GetTextView()-SetReadOnly( bRdOnly );
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index d4199e2..dd15a4b 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -989,24 +989,6 @@ IMapObject* ImageMap::GetHitIMapObject( const Size
rTotalSize,
|*
\**/
-Rectangle ImageMap::GetBoundRect() const
-{
-Rectangle aBoundRect;
-size_t nCount = maList.size();
-
-for ( size_t i = 0; i nCount; i++ )
-aBoundRect.Union( maList[ i ]-GetBoundRect() );
-
-return aBoundRect;
-}
-
-
-/**
-|*
-|*
-|*
-\**/
-
void ImageMap::Scale( const Fraction rFracX, const Fraction rFracY )
{
size_t nCount = maList.size();
diff --git a/unusedcode.easy b/unusedcode.easy
index af2cff9..b65437f 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -28,19 +28,13 @@ HTMLControls::Insert(HTMLControl const**, unsigned short)
HTMLControls::Insert(HTMLControls const*, unsigned short, unsigned short)
HTMLControls::Remove(HTMLControl const*, unsigned short)
HTMLControls::Remove(unsigned short, unsigned short)
-ImageButton::ImageButton(unsigned short)
-ImageMap::GetBoundRect() const
-ImpSvMEdit::SetInsertMode(unsigned char)
ImpSvtData::~ImpSvtData()
ImplDevFontList::ImplFindByLocale(com::sun::star::lang::Locale) const
-ImplEntryList::IsEntrySelected(String const) const
-ImplImageList::GetImageCount() const
InsCapOptArr::Insert(InsCapOptArr const*, unsigned short, unsigned short)
InsCapOptArr::Insert(InsCaptionOpt* const, unsigned short)
InsCapOptArr::Insert(InsCaptionOpt* const*, unsigned short)
InsCapOptArr::Remove(InsCaptionOpt* const, unsigned short)
InsCapOptArr::Remove(unsigned short, unsigned short)
-KeyboardSettings::CopyData()
MSDffImportRecords::Insert(MSDffImportRecords const*, unsigned short, unsigned
short)
MSDffImportRecords::Insert(SvxMSDffImportRec* const, unsigned short)
MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index c1355f0..cecf3b8 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -168,7 +168,6 @@ public:
sal_uInt16 GetSelectEntryCount() const;
XubString GetSelectEntry( sal_uInt16 nIndex ) const;
sal_uInt16 GetSelectEntryPos( sal_uInt16 nIndex ) const;
-sal_BoolIsEntrySelected( const XubString rStr ) const;
sal_BoolIsEntryPosSelected( sal_uInt16 nIndex ) const;
voidSetLastSelected( sal_uInt16 nPos ) { mnLastSelected =
nPos; }
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index 1497750..f8abc4e
[Libreoffice-commits] .: svtools/inc svtools/source unusedcode.easy
svtools/inc/svtools/ctrlbox.hxx| 33 -
svtools/source/control/ctrlbox.cxx | 24
unusedcode.easy|3 ---
3 files changed, 60 deletions(-)
New commits:
commit 458c80234b701fb1cb9a71239cec532c54b2e9f0
Author: Mariusz Dykierek mariuszdykie...@gmail.com
Date: Mon Jan 23 13:53:54 2012 +0530
Removed Get*EntryLine? and Get*EntryDistance methods.
diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 5815719..a4d9eff 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -352,16 +352,10 @@ public:
using ListBox::GetEntryPos;
virtual sal_uInt16 GetEntryPos( sal_uInt16 nStyle = STYLE_SOLID ) const;
-longGetEntryLine1( sal_uInt16 nPos ) const;
-longGetEntryLine2( sal_uInt16 nPos ) const;
-longGetEntryDistance( sal_uInt16 nPos ) const;
sal_uInt16 GetEntryStyle( sal_uInt16 nPos ) const;
voidSelectEntry( const XubString rStr, sal_Bool bSelect =
sal_True ) { ListBox::SelectEntry( rStr, bSelect ); }
voidSelectEntry( sal_uInt16 nStyle = STYLE_SOLID, sal_Bool
bSelect = sal_True );
-longGetSelectEntryLine1( sal_uInt16 nSelIndex = 0 ) const;
-longGetSelectEntryLine2( sal_uInt16 nSelIndex = 0 ) const;
-longGetSelectEntryDistance( sal_uInt16 nSelIndex = 0 ) const;
sal_uInt16 GetSelectEntryStyle( sal_uInt16 nSelIndex = 0 ) const;
inline sal_Bool IsEntrySelected( const XubString rStr ) const {
return ListBox::IsEntrySelected( rStr ); }
sal_BoolIsEntrySelected( sal_uInt16 nStyle1 = STYLE_SOLID )
const;
@@ -389,33 +383,6 @@ private:
void* GetEntryData( sal_uInt16 nPos ) const;
};
-inline long LineListBox::GetSelectEntryLine1( sal_uInt16 nSelIndex ) const
-{
-sal_uInt16 nPos = GetSelectEntryPos( nSelIndex );
-if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-return GetEntryLine1( nPos );
-else
-return 0;
-}
-
-inline long LineListBox::GetSelectEntryLine2( sal_uInt16 nSelIndex ) const
-{
-sal_uInt16 nPos = GetSelectEntryPos( nSelIndex );
-if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-return GetEntryLine2( nPos );
-else
-return 0;
-}
-
-inline long LineListBox::GetSelectEntryDistance( sal_uInt16 nSelIndex ) const
-{
-sal_uInt16 nPos = GetSelectEntryPos( nSelIndex );
-if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-return GetEntryDistance( nPos );
-else
-return 0;
-}
-
inline sal_Bool LineListBox::IsEntrySelected( sal_uInt16 nStyle ) const
{
sal_uInt16 nPos = GetEntryPos( nStyle );
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index d4959ec..ce72cdc 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -851,30 +851,6 @@ sal_uInt16 LineListBox::GetEntryPos( sal_uInt16 nStyle )
const
// ---
-long LineListBox::GetEntryLine1( sal_uInt16 nPos ) const
-{
-ImpLineListData* pData = (nPos pLineList-size()) ? (*pLineList)[ nPos ]
: NULL;
-return ( pData ) ? pData-GetLine1ForWidth( m_nWidth ) : 0;
-}
-
-// ---
-
-long LineListBox::GetEntryLine2( sal_uInt16 nPos ) const
-{
-ImpLineListData* pData = (nPos pLineList-size()) ? (*pLineList)[ nPos ]
: NULL;
-return ( pData ) ? pData-GetLine2ForWidth( m_nWidth ) : 0;
-}
-
-// ---
-
-long LineListBox::GetEntryDistance( sal_uInt16 nPos ) const
-{
-ImpLineListData* pData = (nPos pLineList-size()) ? (*pLineList)[ nPos ]
: NULL;
-return ( pData ) ? pData-GetDistForWidth( m_nWidth ) : 0;
-}
-
-// ---
-
sal_uInt16 LineListBox::GetEntryStyle( sal_uInt16 nPos ) const
{
ImpLineListData* pData = (nPos pLineList-size()) ? (*pLineList)[ nPos ]
: NULL;
diff --git a/unusedcode.easy b/unusedcode.easy
index 9d44e00..caa31b1 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -112,9 +112,6 @@ InsCapOptArr::Remove(InsCaptionOpt* const, unsigned short)
InsCapOptArr::Remove(unsigned short, unsigned short)
ItemList::FindAttrib(unsigned short)
KeyboardSettings::CopyData()
-LineListBox::GetEntryDistance(unsigned short) const
-LineListBox::GetEntryLine1(unsigned short) const
-LineListBox::GetEntryLine2(unsigned short) const
LinkStructArr::DeleteAndDestroy(unsigned short, unsigned short)
LngSvcMgr::RemoveLngSvcEvtBroadcaster(com::sun::star::uno::Referencecom::sun::star::linguistic2::XLinguServiceEventBroadcaster
const)
LocaleDataWrapper::getCollatorImplementations() const
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
[Libreoffice-commits] .: svtools/inc svtools/source
svtools/inc/svtools/filedlg.hxx | 30 -
svtools/source/dialogs/filedlg.cxx | 21 -
svtools/source/dialogs/filedlg2.cxx | 594
svtools/source/dialogs/filedlg2.hxx | 71
4 files changed, 11 insertions(+), 705 deletions(-)
New commits:
commit 7482e974117df2bdc737785efdf9eb410787c7b4
Author: Michael Stahl mst...@redhat.com
Date: Thu Jan 5 18:37:42 2012 +0100
svtools: remove unused FileDialog
svtools/filedlg.hxx(88) : warning C4610: class ´FileDialog´ can never be
instantiated
diff --git a/svtools/inc/svtools/filedlg.hxx b/svtools/inc/svtools/filedlg.hxx
index d25219a..b771631 100644
--- a/svtools/inc/svtools/filedlg.hxx
+++ b/svtools/inc/svtools/filedlg.hxx
@@ -26,8 +26,8 @@
*
/
-#ifndef _SVT_FILEDLG_HXX
-#define _SVT_FILEDLG_HXX
+#ifndef SVT_FILEDLG_HXX
+#define SVT_FILEDLG_HXX
#include svtools/svtdllapi.h
@@ -43,10 +43,8 @@ class ImpSvFileDlg;
class SVT_DLLPUBLIC PathDialog : public ModalDialog
{
private:
-friend class FileDialog;// Imp...
-
ImpSvFileDlg* pImpFileDlg;// Implementation
-LinkaOKHdlLink; // Link zum OK-Handler
+LinkaOKHdlLink; // Link to OK-Handler
protected:
UniString aDfltExt; // Default - Extension
@@ -67,26 +65,6 @@ public:
virtual short Execute();
};
-// --
-// - SvFileDialog -
-// --
-
-class SVT_DLLPUBLIC FileDialog : public PathDialog
-{
-private:
-LinkaFileHdlLink; // Link zum FileSelect-Handler
-LinkaFilterHdlLink; // Link zum FilterSelect-Handler
-
-public:
-~FileDialog();
-
-virtual voidFileSelect();
-virtual voidFilterSelect();
-
-const UniStringGetDefaultExt() const { return aDfltExt; }
-UniString GetFilterType( sal_uInt16 nPos ) const;
-};
-
-#endif // _FILEDLG_HXX
+#endif // FILEDLG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/filedlg.cxx
b/svtools/source/dialogs/filedlg.cxx
index 77a071c..c2224ae 100644
--- a/svtools/source/dialogs/filedlg.cxx
+++ b/svtools/source/dialogs/filedlg.cxx
@@ -34,7 +34,7 @@ PathDialog::PathDialog( Window* _pParent, WinBits nStyle,
sal_Bool bCreateDir )
ModalDialog( _pParent, WB_STDMODAL | nStyle )
{
pImpFileDlg = new ImpSvFileDlg;
-pImpFileDlg-CreateDialog( this, nStyle, WINDOW_PATHDIALOG, bCreateDir );
+pImpFileDlg-CreatePathDialog(this, bCreateDir);
}
PathDialog::~PathDialog()
@@ -72,23 +72,4 @@ long PathDialog::OK()
return sal_True;
}
-FileDialog::~FileDialog()
-{
-}
-
-void FileDialog::FileSelect()
-{
-aFileHdlLink.Call( this );
-}
-
-void FileDialog::FilterSelect()
-{
-aFilterHdlLink.Call( this );
-}
-
-UniString FileDialog::GetFilterType( sal_uInt16 nPos ) const
-{
- return ((ImpFileDialog*)pImpFileDlg-GetDialog())-GetFilterType( nPos );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/filedlg2.cxx
b/svtools/source/dialogs/filedlg2.cxx
index 319848f..32f6ef6 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.cxx
@@ -692,600 +692,10 @@ UniString ImpPathDialog::GetPath() const
return aFile.GetFull();
}
-
-ImpFileDialog::ImpFileDialog( PathDialog* pDlg, WinBits nWinBits,
RESOURCE_TYPE nType ) :
- ImpPathDialog( pDlg, nType, sal_False )
-{
-bOpen = (nWinBits WB_SAVEAS) == 0;
-
-SvtResId aSvtResId = bOpen ? STR_FILEDLG_OPEN : STR_FILEDLG_SAVE;
-
-// Titel setzen
-GetFileDialog()-SetText( UniString( aSvtResId ) );
-nDirCount = 0;
-
-// initialize Controls if not used as a base class
-if ( nType == WINDOW_FILEDIALOG )
-InitControls();
-
-pDlg-SetHelpId( HID_FILEDLG_OPENDLG );
-
-}
-
-ImpFileDialog::~ImpFileDialog()
-{
-for ( size_t i = 0, n = aFilterList.size(); i n; ++i ) {
-delete aFilterList[ i ];
-}
-aFilterList.clear();
-
-delete pFileTitel;
-if (pFileList ( pFileList != pDirList ) )
-delete pFileList;
-
-delete pTypeTitel;
-delete pTypeList;
-}
-
-void ImpFileDialog::InitControls()
-{
-UniString aEmptyStr;
-
-const int nW = 160;
-const int nH = 48; // Um den Dialog in eine akzeptable Form zu bringen
-
-INITCONTROL( pFileTitel, FixedText, 0,
-Point(10, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_FILE )
), HID_FILEDLG_FILE );
-INITCONTROL( pEdit, Edit, WB_BORDER,
-Point(10, 31), Size(nW, 20), aEmptyStr, HID_FILEDLG_EDIT ); // aMask()
-INITCONTROL( pFileList, ListBox, WB_SORT | WB_AUTOHSCROLL | WB_BORDER,
-Point(10, 58), Size(nW, 180-nH), aEmptyStr, HID_FILEDLG_FILES );
-
-INITCONTROL( pDirTitel, FixedText, 0,
-Point(nW+20, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_DIR )
),
[Libreoffice-commits] .: svtools/inc svtools/source
svtools/inc/svtools/sampletext.hxx |2
svtools/source/misc/sampletext.cxx | 137 -
2 files changed, 137 insertions(+), 2 deletions(-)
New commits:
commit ada314807900a6b9205bacc1b149ab58720ffa7b
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 20 12:53:31 2011 +0100
add makeRepresentativeTextForLanguage to generate sample text
add initial code to generate language specific sample preview text samples
for
use for font previewing in format-character
diff --git a/svtools/inc/svtools/sampletext.hxx
b/svtools/inc/svtools/sampletext.hxx
index 1100c8a..09ba499 100644
--- a/svtools/inc/svtools/sampletext.hxx
+++ b/svtools/inc/svtools/sampletext.hxx
@@ -31,6 +31,7 @@
#include svtools/svtdllapi.h
#include rtl/ustring.hxx
#include unicode/uscript.h
+#include i18npool/lang.h
#include vcl/fontcapabilities.hxx
class OutputDevice;
@@ -44,6 +45,7 @@ SVT_DLLPUBLIC bool canRenderNameOfSelectedFont(OutputDevice
rDevice);
SVT_DLLPUBLIC rtl::OUString
makeRepresentativeSymbolTextForSelectedFont(OutputDevice rDevice);
SVT_DLLPUBLIC rtl::OUString makeRepresentativeTextForSelectedFont(OutputDevice
rDevice);
+SVT_DLLPUBLIC rtl::OUString makeRepresentativeTextForLanguage(LanguageType
eLang);
SVT_DLLPUBLIC rtl::OUString makeRepresentativeTextForScript(UScriptCode
eScript);
SVT_DLLPUBLIC rtl::OUString makeMinimalTextForScript(UScriptCode eScript);
diff --git a/svtools/source/misc/sampletext.cxx
b/svtools/source/misc/sampletext.cxx
index 6cf1604..45a6ba9 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -117,6 +117,16 @@ rtl::OUString
makeRepresentativeSymbolTextForSelectedFont(OutputDevice rDevice)
return bHasSampleTextGlyphs ? sSampleText : rtl::OUString();
}
+//These ones are typically for use in the font dropdown box beside the
+//fontname, so say things roughly like Script/Alphabet/Name-Of-Major-Language
+//
+//Here we don't always know the language of course, only the script that can be
+//written with the font. Often that's one single language written in that
+//script, or a handful of related languages where the name of the script is the
+//same between languages, or the name in the major language is known by most
+//readers of the minor languages, e.g. Yiddish is written with the HEBREW
+//script as well, the vast majority of Yiddish readers will be able to read
+//Hebrew as well.
rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript)
{
rtl::OUString sSampleText;
@@ -427,8 +437,131 @@ rtl::OUString makeMinimalTextForScript(UScriptCode
eScript)
return sSampleText;
}
-#define TRADITIONAL_CHINESE 0x0100
-#define SIMPLIFIED_CHINESE 0x0200
+//These ones are typically for use in the font preview window in format
+//character
+//
+//There we generally know the language. Though its possible for the language to
+//be none.
+//
+//Currently we fall back to makeRepresentativeTextForScript as I don't have
+//suitable strings
+rtl::OUString makeRepresentativeTextForLanguage(LanguageType eLang)
+{
+switch( eLang )
+{
+case LANGUAGE_CHINESE:
+return makeRepresentativeTextForScript(USCRIPT_HAN);
+
+case LANGUAGE_CHINESE_TRADITIONAL:
+case LANGUAGE_CHINESE_HONGKONG:
+case LANGUAGE_CHINESE_MACAU:
+return makeRepresentativeTextForScript(USCRIPT_TRADITIONAL_HAN);
+
+case LANGUAGE_CHINESE_SIMPLIFIED:
+case LANGUAGE_CHINESE_SINGAPORE:
+return makeRepresentativeTextForScript(USCRIPT_SIMPLIFIED_HAN);
+}
+
+rtl::OUString sRet;
+switch( eLang LANGUAGE_MASK_PRIMARY )
+{
+case LANGUAGE_GREEK LANGUAGE_MASK_PRIMARY:
+sRet = makeRepresentativeTextForScript(USCRIPT_GREEK);
+break;
+case LANGUAGE_HEBREW LANGUAGE_MASK_PRIMARY:
+case LANGUAGE_YIDDISH LANGUAGE_MASK_PRIMARY:
+sRet = makeRepresentativeTextForScript(USCRIPT_HEBREW);
+break;
+case LANGUAGE_ARABIC_SAUDI_ARABIA LANGUAGE_MASK_PRIMARY:
+sRet = makeRepresentativeTextForScript(USCRIPT_ARABIC);
+break;
+case LANGUAGE_HINDI LANGUAGE_MASK_PRIMARY:
+sRet = makeRepresentativeTextForScript(USCRIPT_DEVANAGARI);
+break;
+case LANGUAGE_ASSAMESE LANGUAGE_MASK_PRIMARY:
+{
+const sal_Unicode aAs[] = {
+0x0985, 0x09B8, 0x09AE, 0x09C0, 0x09AF, 0x09BC, 0x09BE,
+0x0020, 0x0986, 0x0996, 0x09F0
+};
+sRet = rtl::OUString(aAs, SAL_N_ELEMENTS(aAs));
+break;
+}
+case LANGUAGE_BENGALI LANGUAGE_MASK_PRIMARY:
+sRet = makeRepresentativeTextForScript(USCRIPT_BENGALI);
+break;
+case LANGUAGE_PUNJABI LANGUAGE_MASK_PRIMARY:
+sRet = makeRepresentativeTextForScript(USCRIPT_GURMUKHI);
+break;
+case LANGUAGE_GUJARATI
