[Libreoffice-commits] .: 2 commits - vcl/inc vcl/unx
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Mon Jan 9 09:23:04 PST 2012
vcl/inc/unx/i18n_cb.hxx | 3 --
vcl/inc/unx/i18n_ic.hxx | 1
vcl/inc/unx/saldisp.hxx | 2 -
vcl/unx/generic/app/i18n_cb.cxx | 39 ----------------------------
vcl/unx/generic/app/i18n_ic.cxx | 42 -------------------------------
vcl/unx/generic/app/saldisp.cxx | 54 ----------------------------------------
6 files changed, 141 deletions(-)
New commits:
commit 22d05186ed7bf0314b43e1db09eb8706d09c6da1
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Dec 17 19:29:49 2011 +0100
callcatcher: remove unused SalColormap methods
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index ded2d1c..8fd0507 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -163,7 +163,6 @@ public:
SalColormap( const SalDisplay* pSalDisplay,
Colormap hColormap,
int nScreen );
- SalColormap( const BitmapPalette &rpPalette );
SalColormap( sal_uInt16 nDepth );
SalColormap();
~SalColormap();
@@ -189,7 +188,6 @@ public:
int b ) const;
Pixel GetPixel( SalColor nColor ) const;
SalColor GetColor( Pixel nPixel ) const;
- void SetPalette( const BitmapPalette &rPalette );
};
// -=-= SalXLib =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 3c53b7b..75882cc 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2777,30 +2777,6 @@ SalColormap::SalColormap( const SalDisplay *pDisplay, Colormap hColormap, int nS
}
}
-// PseudoColor
-SalColormap::SalColormap( const BitmapPalette &rPalette )
- : m_pDisplay( GetGenericData()->GetSalDisplay() ),
- m_hColormap( None ),
- m_nWhitePixel( SALCOLOR_NONE ),
- m_nBlackPixel( SALCOLOR_NONE ),
- m_nUsed( rPalette.GetEntryCount() ),
- m_nScreen( GetGenericData()->GetSalDisplay()->GetDefaultScreenNumber() )
-{
- m_aPalette = std::vector<SalColor>(m_nUsed);
-
- for( unsigned int i = 0; i < m_nUsed; i++ )
- {
- const BitmapColor &rColor = rPalette[i];
- m_aPalette[i] = MAKE_SALCOLOR( rColor.GetRed(),
- rColor.GetGreen(),
- rColor.GetBlue() );
- if( (m_nBlackPixel == SALCOLOR_NONE) && (SALCOLOR_BLACK == m_aPalette[i]) )
- m_nBlackPixel = i;
- else if( (m_nWhitePixel == SALCOLOR_NONE) && (SALCOLOR_WHITE == m_aPalette[i]) )
- m_nWhitePixel = i;
- }
-}
-
// MonoChrome
SalColormap::SalColormap()
: m_pDisplay( GetGenericData()->GetSalDisplay() ),
@@ -2913,36 +2889,6 @@ SalColormap::~SalColormap()
#endif
}
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void SalColormap::SetPalette( const BitmapPalette &rPalette )
-{
- if( this != &GetGenericData()->GetSalDisplay()->GetColormap(m_nScreen) )
- {
- m_nBlackPixel = SALCOLOR_NONE;
- m_nWhitePixel = SALCOLOR_NONE;
- }
-
- if( rPalette.GetEntryCount() > m_nUsed )
- {
- m_nBlackPixel = SALCOLOR_NONE;
- m_nWhitePixel = SALCOLOR_NONE;
- m_nUsed = rPalette.GetEntryCount();
- m_aPalette = std::vector<SalColor>(m_nUsed);
- }
-
- for( int i = 0; i < rPalette.GetEntryCount(); i++ )
- {
- const BitmapColor &rColor = rPalette[i];
- m_aPalette[i] = MAKE_SALCOLOR( rColor.GetRed(),
- rColor.GetGreen(),
- rColor.GetBlue() );
- if( (m_nBlackPixel == SALCOLOR_NONE) && (SALCOLOR_BLACK == m_aPalette[i]) )
- m_nBlackPixel = i;
- else if( (m_nWhitePixel == SALCOLOR_NONE) && (SALCOLOR_WHITE == m_aPalette[i]) )
- m_nWhitePixel = i;
- }
-}
-
void SalColormap::GetPalette()
{
Pixel i;
commit f072008981f77e8e28a9f088b4c3604b860af5f8
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Dec 17 19:27:21 2011 +0100
callcatcher: clean up vcl i18n
diff --git a/vcl/inc/unx/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx
index 7b16a7d..e00dc5f 100644
--- a/vcl/inc/unx/i18n_cb.hxx
+++ b/vcl/inc/unx/i18n_cb.hxx
@@ -35,9 +35,6 @@
extern "C" {
#endif
-// for iiimp / ml input
-int CommitStringCallback( XIC ic, XPointer client_data, XPointer call_data);
-
// xim callbacks
void PreeditDoneCallback ( XIC ic, XPointer client_data, XPointer call_data);
int PreeditStartCallback( XIC ic, XPointer client_data, XPointer call_data);
diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index 3a9c5ab..5e427f9 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -82,7 +82,6 @@ public:
void Map( SalFrame *pFrame );
void Unmap( SalFrame* pFrame );
- void SetPreeditState(Bool aPreeditState);
void SetLanguage(LanguageType aInputLanguage);
SalI18N_InputContext( SalFrame *aFrame );
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index b37d0ab..40818d0 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -498,45 +498,6 @@ IsControlCode(sal_Unicode nChar)
return False;
}
-int
-CommitStringCallback( XIC ic, XPointer client_data, XPointer call_data )
-{
- preedit_data_t* pPreeditData = (preedit_data_t*)client_data;
-
- XIMUnicodeText *cbtext = (XIMUnicodeText *)call_data;
- sal_Unicode *p_unicode_data = (sal_Unicode*)cbtext->string.utf16_char;
-
- // filter unexpected pure control events
- if (cbtext->length == 1 && IsControlCode(p_unicode_data[0]) )
- {
- if( pPreeditData->pFrame )
- {
- pPreeditData->pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, (void*)NULL );
- }
- }
- else
- {
- if( pPreeditData->pFrame )
- {
- pPreeditData->aInputEv.mnTime = 0;
- pPreeditData->aInputEv.mpTextAttr = 0;
- pPreeditData->aInputEv.mnCursorPos = cbtext->length;
- pPreeditData->aInputEv.maText = UniString(p_unicode_data, cbtext->length);
- pPreeditData->aInputEv.mnCursorFlags = 0; // default: make cursor visible
- pPreeditData->aInputEv.mnDeltaStart = 0;
- pPreeditData->aInputEv.mbOnlyCursor = False;
-
- pPreeditData->pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&pPreeditData->aInputEv);
- pPreeditData->pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, (void*)NULL );
- }
- }
- pPreeditData->eState = ePreeditStatusStartPending;
-
- GetPreeditSpotLocation(ic, (XPointer)pPreeditData);
-
- return 0;
-}
-
// ----------------------------------------------------------------------------------
//
// vi. status callbacks: for now these are empty, they are just needed for turbo linux
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index 7b48cab..fad955c 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -565,21 +565,6 @@ SalI18N_InputContext::SupportInputMethodStyle( XIMStyles *pIMStyles )
// ---------------------------------------------------------------------------
int
-SalI18N_InputContext::CommitStringCallback (sal_Unicode* pText, sal_Size nLength)
-{
- XIMUnicodeText call_data;
-
- call_data.string.utf16_char = pText;
- call_data.length = nLength;
- call_data.annotations = NULL;
- call_data.count_annotations = 0;
- call_data.feedback = NULL;
-
- return ::CommitStringCallback( maContext,
- (XPointer)&maClientData, (XPointer)&call_data );
-}
-
-int
SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength)
{
if (nLength == 1 && IsControlCode(pText[0]))
@@ -689,33 +674,6 @@ SalI18N_InputContext::UnsetICFocus( SalFrame* pFrame )
// ---------------------------------------------------------------------------
void
-SalI18N_InputContext::SetPreeditState(Bool aPreeditState)
-{
- XIMPreeditState preedit_state = XIMPreeditUnKnown;
- XVaNestedList preedit_attr;
-
- preedit_attr = XVaCreateNestedList(
- 0,
- XNPreeditState, &preedit_state,
- NULL);
- if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL))
- {
- XFree(preedit_attr);
-
- preedit_state = aPreeditState? XIMPreeditEnable : XIMPreeditDisable;
- preedit_attr = XVaCreateNestedList(
- 0,
- XNPreeditState, preedit_state,
- NULL);
- XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
- }
-
- XFree(preedit_attr);
-
- return;
-}
-
-void
SalI18N_InputContext::SetLanguage(LanguageType)
{
// not yet implemented
More information about the Libreoffice-commits
mailing list