[Libreoffice-commits] .: 2 commits - cui/source editeng/inc editeng/source sax/inc sax/source svx/inc svx/source sw/Library_sw.mk sw/source unusedcode.easy vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Jan 13 15:02:58 PST 2013
cui/source/inc/numpages.hxx | 1
cui/source/tabpages/numpages.cxx | 7
editeng/inc/editeng/editobj.hxx | 13 -
editeng/source/editeng/editobj.cxx | 246 --------------------------------
editeng/source/editeng/editobj2.hxx | 15 -
sax/inc/sax/tools/converter.hxx | 5
sax/source/tools/converter.cxx | 20 --
svx/inc/svx/rubydialog.hxx | 1
svx/source/dialog/rubydialog.cxx | 8 -
sw/Library_sw.mk | 1
sw/source/ui/inc/convert.hxx | 1
sw/source/ui/inc/glossary.hxx | 1
sw/source/ui/inc/instable.hxx | 1
sw/source/ui/inc/textcontrolcombo.hxx | 58 -------
sw/source/ui/misc/glossary.cxx | 9 -
sw/source/ui/table/tablepg.hxx | 1
sw/source/ui/utlui/textcontrolcombo.cxx | 102 -------------
unusedcode.easy | 6
vcl/source/filter/FilterConfigCache.cxx | 10 -
vcl/source/filter/FilterConfigCache.hxx | 2
20 files changed, 4 insertions(+), 504 deletions(-)
New commits:
commit 612981fc8fd7a35d8112951e05e1b2cf0f5f1c08
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jan 13 09:36:46 2013 +0000
callcatcher: update and remove newly unused code
Change-Id: Iff3ce7c3a44010b3bc81fc0d2156216ee13948dc
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 952635d..a8b0dc2 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -51,7 +51,6 @@ class SvxNumberingPreview : public Window
virtual void Paint( const Rectangle& rRect );
public:
- SvxNumberingPreview(Window* pParent, const ResId& rResId );
SvxNumberingPreview(Window* pParent, WinBits nWinBits = WB_BORDER);
void SetNumRule(const SvxNumRule* pNum)
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index afdacc6..b7bd072 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2284,13 +2284,6 @@ static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev,
return nRet;
}
-SvxNumberingPreview::SvxNumberingPreview(Window* pParent, const ResId& rResId )
- : Window(pParent, rResId), pActNum(0),nPageWidth(0), pOutlineNames(0)
- , bPosition(sal_False), nActLevel(USHRT_MAX)
-{
- SetBorderStyle( WINDOW_BORDER_MONO );
-}
-
SvxNumberingPreview::SvxNumberingPreview(Window* pParent, WinBits nWinBits)
: Window(pParent, nWinBits)
, pActNum(0)
diff --git a/editeng/inc/editeng/editobj.hxx b/editeng/inc/editeng/editobj.hxx
index 1298496..985b7c4 100644
--- a/editeng/inc/editeng/editobj.hxx
+++ b/editeng/inc/editeng/editobj.hxx
@@ -72,16 +72,11 @@ public:
sal_uInt16 GetUserType() const; // For OutlinerMode, it can however not save in compatible format
void SetUserType( sal_uInt16 n );
- sal_uLong GetObjectSettings() const;
- void SetObjectSettings( sal_uLong n );
-
bool IsVertical() const;
void SetVertical( bool bVertical );
sal_uInt16 GetScriptType() const;
- sal_uInt16 GetVersion() const; // As long as the outliner does not store any record length.
-
EditTextObject* Clone() const;
bool Store( SvStream& rOStream ) const;
@@ -92,23 +87,16 @@ public:
size_t GetParagraphCount() const;
String GetText(size_t nPara) const;
- void Insert(const EditTextObject& rObj, size_t nPara);
- void RemoveParagraph(size_t nPara);
- EditTextObject* CreateTextObject(size_t nPara, size_t nParas = 1) const;
- bool HasPortionInfo() const;
void ClearPortionInfo();
bool HasOnlineSpellErrors() const;
- bool HasCharAttribs( sal_uInt16 nWhich = 0 ) const;
void GetCharAttribs( sal_uInt16 nPara, std::vector<EECharAttrib>& rLst ) const;
bool RemoveCharAttribs( sal_uInt16 nWhich = 0 );
bool RemoveParaAttribs( sal_uInt16 nWhich = 0 );
- void MergeParaAttribs( const SfxItemSet& rAttribs, sal_uInt16 nStart = EE_CHAR_START, sal_uInt16 nEnd = EE_CHAR_END );
-
bool IsFieldObject() const;
const SvxFieldItem* GetField() const;
bool HasField( sal_Int32 nType = com::sun::star::text::textfield::Type::UNSPECIFIED ) const;
@@ -116,7 +104,6 @@ public:
const SfxItemSet& GetParaAttribs(size_t nPara) const;
void SetParaAttribs(size_t nPara, const SfxItemSet& rAttribs);
- bool HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const;
void GetStyleSheet(size_t nPara, String& rName, SfxStyleFamily& eFamily) const;
void SetStyleSheet(size_t nPara, const String& rName, const SfxStyleFamily& eFamily);
bool ChangeStyleSheets(
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 41698af..5f400be 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -205,26 +205,6 @@ String EditTextObject::GetText(size_t nPara) const
return mpImpl->GetText(nPara);
}
-void EditTextObject::Insert(const EditTextObject& rObj, size_t nPara)
-{
- mpImpl->Insert(rObj, nPara);
-}
-
-EditTextObject* EditTextObject::CreateTextObject(size_t nPara, size_t nParas) const
-{
- return mpImpl->CreateTextObject(nPara, nParas);
-}
-
-void EditTextObject::RemoveParagraph(size_t nPara)
-{
- mpImpl->RemoveParagraph(nPara);
-}
-
-bool EditTextObject::HasPortionInfo() const
-{
- return mpImpl->HasPortionInfo();
-}
-
void EditTextObject::ClearPortionInfo()
{
mpImpl->ClearPortionInfo();
@@ -235,21 +215,11 @@ bool EditTextObject::HasOnlineSpellErrors() const
return mpImpl->HasOnlineSpellErrors();
}
-bool EditTextObject::HasCharAttribs( sal_uInt16 nWhich ) const
-{
- return mpImpl->HasCharAttribs(nWhich);
-}
-
void EditTextObject::GetCharAttribs( sal_uInt16 nPara, std::vector<EECharAttrib>& rLst ) const
{
mpImpl->GetCharAttribs(nPara, rLst);
}
-void EditTextObject::MergeParaAttribs( const SfxItemSet& rAttribs, sal_uInt16 nStart, sal_uInt16 nEnd )
-{
- mpImpl->MergeParaAttribs(rAttribs, nStart, nEnd);
-}
-
bool EditTextObject::IsFieldObject() const
{
return mpImpl->IsFieldObject();
@@ -285,11 +255,6 @@ bool EditTextObject::RemoveParaAttribs( sal_uInt16 nWhich )
return mpImpl->RemoveParaAttribs(nWhich);
}
-bool EditTextObject::HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const
-{
- return mpImpl->HasStyleSheet(rName, eFamily);
-}
-
void EditTextObject::GetStyleSheet(size_t nPara, String& rName, SfxStyleFamily& eFamily) const
{
mpImpl->GetStyleSheet(nPara, rName, eFamily);
@@ -327,16 +292,6 @@ void EditTextObject::SetUserType( sal_uInt16 n )
mpImpl->SetUserType(n);
}
-sal_uLong EditTextObject::GetObjectSettings() const
-{
- return mpImpl->GetObjectSettings();
-}
-
-void EditTextObject::SetObjectSettings( sal_uLong n )
-{
- mpImpl->SetObjectSettings(n);
-}
-
bool EditTextObject::IsVertical() const
{
return mpImpl->IsVertical();
@@ -417,11 +372,6 @@ void EditTextObject::CreateData( SvStream& rStrm )
mpImpl->CreateData(rStrm);
}
-sal_uInt16 EditTextObject::GetVersion() const
-{
- return mpImpl->GetVersion();
-}
-
EditTextObject* EditTextObject::Clone() const
{
return new EditTextObject(*this);
@@ -597,16 +547,6 @@ void EditTextObjectImpl::SetUserType( sal_uInt16 n )
nUserType = n;
}
-sal_uLong EditTextObjectImpl::GetObjectSettings() const
-{
- return nObjSettings;
-}
-
-void EditTextObjectImpl::SetObjectSettings( sal_uLong n )
-{
- nObjSettings = n;
-}
-
bool EditTextObjectImpl::IsVertical() const
{
return bVertical;
@@ -671,66 +611,6 @@ String EditTextObjectImpl::GetText(size_t nPara) const
return aContents[nPara].GetText();
}
-void EditTextObjectImpl::Insert(const EditTextObject& rObj, size_t nDestPara)
-{
- const EditTextObjectImpl& rBinObj = *rObj.mpImpl;
-
- if (nDestPara > aContents.size())
- nDestPara = aContents.size();
-
- const ContentInfosType& rCIs = rBinObj.aContents;
- for (size_t i = 0, n = rCIs.size(); i < n; ++i)
- {
- const ContentInfo& rC = rCIs[i];
- size_t nPos = nDestPara + i;
- aContents.insert(
- aContents.begin()+nPos, new ContentInfo(rC, *GetPool()));
- }
-
- ClearPortionInfo();
-}
-
-EditTextObject* EditTextObjectImpl::CreateTextObject(size_t nPara, size_t nParas) const
-{
- if (nPara >= aContents.size() || !nParas)
- return NULL;
-
- // Only split the Pool, when a the Pool is set externally.
- EditTextObject* pObj = new EditTextObject( bOwnerOfPool ? 0 : pPool );
- if ( bOwnerOfPool && pPool )
- pObj->mpImpl->GetPool()->SetDefaultMetric( pPool->GetMetric( DEF_METRIC ) );
-
- // If complete text is only one ScriptType, this is valid.
- // If text contains different ScriptTypes, this shouldn't be a problem...
- pObj->mpImpl->nScriptType = nScriptType;
-
- const size_t nEndPara = nPara+nParas-1;
- for (size_t i = nPara; i <= nEndPara; ++i)
- {
- const ContentInfo& rC = aContents[i];
- ContentInfo* pNew = new ContentInfo(rC, *pObj->mpImpl->GetPool());
- pObj->mpImpl->aContents.push_back(pNew);
- }
- return pObj;
-}
-
-void EditTextObjectImpl::RemoveParagraph(size_t nPara)
-{
- DBG_ASSERT( nPara < aContents.size(), "BinTextObject::GetText: Paragraph does not exist!" );
- if (nPara >= aContents.size())
- return;
-
- ContentInfosType::iterator it = aContents.begin();
- std::advance(it, nPara);
- aContents.erase(it);
- ClearPortionInfo();
-}
-
-bool EditTextObjectImpl::HasPortionInfo() const
-{
- return pPortionInfo ? true : false;
-}
-
void EditTextObjectImpl::ClearPortionInfo()
{
if ( pPortionInfo )
@@ -751,26 +631,6 @@ bool EditTextObjectImpl::HasOnlineSpellErrors() const
return false;
}
-bool EditTextObjectImpl::HasCharAttribs( sal_uInt16 _nWhich ) const
-{
- for (size_t nPara = aContents.size(); nPara; )
- {
- const ContentInfo& rC = aContents[--nPara];
-
- size_t nAttribs = rC.aAttribs.size();
- if ( nAttribs && !_nWhich )
- return true;
-
- for (size_t nAttr = nAttribs; nAttr; )
- {
- const XEditAttribute& rX = rC.aAttribs[--nAttr];
- if (rX.GetItem()->Which() == _nWhich)
- return true;
- }
- }
- return false;
-}
-
void EditTextObjectImpl::GetCharAttribs( sal_uInt16 nPara, std::vector<EECharAttrib>& rLst ) const
{
rLst.clear();
@@ -787,29 +647,6 @@ void EditTextObjectImpl::GetCharAttribs( sal_uInt16 nPara, std::vector<EECharAtt
}
}
-void EditTextObjectImpl::MergeParaAttribs( const SfxItemSet& rAttribs, sal_uInt16 nStart, sal_uInt16 nEnd )
-{
- bool bChanged = false;
-
- for (size_t nPara = aContents.size(); nPara; )
- {
- ContentInfo& rC = aContents[--nPara];
-
- for ( sal_uInt16 nW = nStart; nW <= nEnd; nW++ )
- {
- if ( ( rC.GetParaAttribs().GetItemState( nW, false ) != SFX_ITEM_ON )
- && ( rAttribs.GetItemState( nW, false ) == SFX_ITEM_ON ) )
- {
- rC.GetParaAttribs().Put( rAttribs.Get( nW ) );
- bChanged = true;
- }
- }
- }
-
- if ( bChanged )
- ClearPortionInfo();
-}
-
bool EditTextObjectImpl::IsFieldObject() const
{
return GetField() ? true : false;
@@ -928,18 +765,6 @@ bool EditTextObjectImpl::RemoveParaAttribs( sal_uInt16 _nWhich )
return bChanged;
}
-bool EditTextObjectImpl::HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const
-{
- size_t nParagraphs = aContents.size();
- for (size_t nPara = 0; nPara < nParagraphs; ++nPara)
- {
- const ContentInfo& rC = aContents[nPara];
- if (rC.GetFamily() == eFamily && rC.GetStyle() == rName)
- return true;
- }
- return false;
-}
-
void EditTextObjectImpl::GetStyleSheet(size_t nPara, String& rName, SfxStyleFamily& rFamily) const
{
if (nPara >= aContents.size())
@@ -1467,11 +1292,6 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
}
}
-sal_uInt16 EditTextObjectImpl::GetVersion() const
-{
- return nVersion;
-}
-
bool EditTextObjectImpl::operator==( const EditTextObjectImpl& rCompare ) const
{
if( this == &rCompare )
@@ -1516,70 +1336,4 @@ bool EditTextObjectImpl::isWrongListEqual(const EditTextObjectImpl& rCompare) co
return true;
}
-#define CHARSETMARKER 0x9999
-
-void EditTextObjectImpl::CreateData300( SvStream& rIStream )
-{
- // For forward compatibility.
-
- // First load the Pool...
- // Is always saved in the 300!
- GetPool()->Load( rIStream );
-
- // The number of paragraphs ...
- sal_uInt32 nParagraphs;
- rIStream >> nParagraphs;
-
- // The individual paragraphs...
- for ( sal_uLong nPara = 0; nPara < nParagraphs; nPara++ )
- {
- ContentInfo* pC = CreateAndInsertContent();
-
- // The Text...
- pC->GetText() = rIStream.ReadUniOrByteString(rIStream.GetStreamCharSet());
-
- // StyleName and Family...
- pC->GetStyle() = rIStream.ReadUniOrByteString(rIStream.GetStreamCharSet());
- sal_uInt16 nStyleFamily;
- rIStream >> nStyleFamily;
- pC->GetFamily() = (SfxStyleFamily)nStyleFamily;
-
- // Paragraph attributes ...
- pC->GetParaAttribs().Load( rIStream );
-
- // The number of attributes ...
- sal_uInt32 nAttribs;
- rIStream >> nAttribs;
-
- // And the individual attributes
- // Items as Surregate => always 8 bytes per Attribute
- // Which = 2; Surregat = 2; Start = 2; End = 2;
- for ( sal_uLong nAttr = 0; nAttr < nAttribs; nAttr++ )
- {
- sal_uInt16 _nWhich, nStart, nEnd;
- const SfxPoolItem* pItem;
-
- rIStream >> _nWhich;
- _nWhich = pPool->GetNewWhich( _nWhich );
- pItem = pPool->LoadSurrogate( rIStream, _nWhich, 0 );
- rIStream >> nStart;
- rIStream >> nEnd;
- if ( pItem )
- {
- XEditAttribute* pAttr = new XEditAttribute( *pItem, nStart, nEnd );
- pC->aAttribs.push_back(pAttr);
- }
- }
- }
-
- // Check whether a font was saved
- sal_uInt16 nCharSetMarker;
- rIStream >> nCharSetMarker;
- if ( nCharSetMarker == CHARSETMARKER )
- {
- sal_uInt16 nCharSet;
- rIStream >> nCharSet;
- }
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index 6c0f586..4d8923f 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -187,17 +187,12 @@ public:
sal_uInt16 GetUserType() const;
void SetUserType( sal_uInt16 n );
- sal_uLong GetObjectSettings() const;
- void SetObjectSettings( sal_uLong n );
-
bool IsVertical() const;
void SetVertical( bool b );
sal_uInt16 GetScriptType() const;
void SetScriptType( sal_uInt16 nType );
- sal_uInt16 GetVersion() const; // As long as the outliner does not store any record length
-
ContentInfo* CreateAndInsertContent();
XEditAttribute* CreateAttrib( const SfxPoolItem& rItem, sal_uInt16 nStart, sal_uInt16 nEnd );
void DestroyAttrib( XEditAttribute* pAttr );
@@ -211,23 +206,16 @@ public:
size_t GetParagraphCount() const;
String GetText(size_t nParagraph) const;
- void Insert(const EditTextObject& rObj, size_t nPara);
- EditTextObject* CreateTextObject(size_t nPara, size_t nParas = 1) const;
- void RemoveParagraph(size_t nPara);
- bool HasPortionInfo() const;
void ClearPortionInfo();
bool HasOnlineSpellErrors() const;
- bool HasCharAttribs( sal_uInt16 nWhich = 0 ) const;
void GetCharAttribs( sal_uInt16 nPara, std::vector<EECharAttrib>& rLst ) const;
bool RemoveCharAttribs( sal_uInt16 nWhich = 0 );
bool RemoveParaAttribs( sal_uInt16 nWhich = 0 );
- void MergeParaAttribs( const SfxItemSet& rAttribs, sal_uInt16 nStart, sal_uInt16 nEnd );
-
bool IsFieldObject() const;
const SvxFieldItem* GetField() const;
bool HasField( sal_Int32 nType = com::sun::star::text::textfield::Type::UNSPECIFIED ) const;
@@ -235,7 +223,6 @@ public:
const SfxItemSet& GetParaAttribs(size_t nPara) const;
void SetParaAttribs(size_t nPara, const SfxItemSet& rAttribs);
- bool HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const;
void GetStyleSheet(size_t nPara, String& rName, SfxStyleFamily& eFamily) const;
void SetStyleSheet(size_t nPara, const String& rName, const SfxStyleFamily& eFamily);
bool ChangeStyleSheets(
@@ -244,8 +231,6 @@ public:
editeng::FieldUpdater GetFieldUpdater();
- void CreateData300( SvStream& rIStream );
-
bool HasMetric() const { return nMetric != 0xFFFF; }
sal_uInt16 GetMetric() const { return nMetric; }
void SetMetric( sal_uInt16 n ) { nMetric = n; }
diff --git a/sax/inc/sax/tools/converter.hxx b/sax/inc/sax/tools/converter.hxx
index 8b84feb..30aaea6 100644
--- a/sax/inc/sax/tools/converter.hxx
+++ b/sax/inc/sax/tools/converter.hxx
@@ -99,11 +99,6 @@ public:
static bool convertColor( sal_Int32& rColor,
const ::rtl::OUString&rValue );
- /** convert string to argb color */
- static bool convertColor( sal_Int32& rColor,
- const ::rtl::OUString&rValue,
- const double alpha);
-
/** convert color to string */
static void convertColor( ::rtl::OUStringBuffer &rBuffer,
sal_Int32 nColor );
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index e7fff9a..6293c85 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -495,26 +495,6 @@ bool Converter::convertColor( sal_Int32& rColor, const OUString& rValue )
return true;
}
-/** convert string to rgba color */
-bool Converter::convertColor( sal_Int32& rColor, const OUString& rValue, const double alpha)
-{
- if( rValue.getLength() != 7 || rValue[0] != '#' )
- return false;
-
- rColor = (int) (alpha * 255);
- rColor <<= 8;
-
- rColor |= lcl_gethex( rValue[1] ) * 16 + lcl_gethex( rValue[2] );
- rColor <<= 8;
-
- rColor |= ( lcl_gethex( rValue[3] ) * 16 + lcl_gethex( rValue[4] ) );
- rColor <<= 8;
-
- rColor |= ( lcl_gethex( rValue[5] ) * 16 + lcl_gethex( rValue[6] ) );
-
- return true;
-}
-
static sal_Char aHexTab[] = "0123456789abcdef";
/** convert color to string */
diff --git a/svx/inc/svx/rubydialog.hxx b/svx/inc/svx/rubydialog.hxx
index 3ab0f25..ea7b313 100644
--- a/svx/inc/svx/rubydialog.hxx
+++ b/svx/inc/svx/rubydialog.hxx
@@ -47,7 +47,6 @@ protected:
SvxRubyDialog* m_pParentDlg;
public:
- RubyPreview(SvxRubyDialog& rParent, const ResId& rResId);
RubyPreview(Window *pParent);
void setRubyDialog(SvxRubyDialog* pParentDlg)
{
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index dd58670..8f049b5 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -754,14 +754,6 @@ void SvxRubyDialog::EnableControls(bool bEnable)
m_pApplyPB->Enable(bEnable);
}
-RubyPreview::RubyPreview(SvxRubyDialog& rParent, const ResId& rResId)
- : Window(&rParent, rResId)
- , m_pParentDlg(&rParent)
-{
- SetMapMode(MAP_TWIP);
- SetBorderStyle( WINDOW_BORDER_MONO );
-}
-
RubyPreview::RubyPreview(Window *pParent)
: Window(pParent, WB_BORDER)
, m_pParentDlg(NULL)
diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx
index 42240e15..a200b55 100644
--- a/sw/source/ui/inc/glossary.hxx
+++ b/sw/source/ui/inc/glossary.hxx
@@ -70,7 +70,6 @@ class SwGlTreeListBox : public SvTreeListBox
SvTreeListEntry*& rpNewParent,
sal_uLong& rNewChildPos);
public:
- SwGlTreeListBox(Window* pParent, const ResId& rResId);
SwGlTreeListBox(Window* pParent, WinBits nBits);
virtual void RequestHelp( const HelpEvent& rHEvt );
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index be6adaa..975281f 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -842,15 +842,6 @@ IMPL_LINK( SwGlossaryDlg, CheckBoxHdl, CheckBox *, pBox )
/* --------------------------------------------------
* TreeListBox for groups and blocks
* --------------------------------------------------*/
-SwGlTreeListBox::SwGlTreeListBox(Window* pParent, const ResId& rResId)
- : SvTreeListBox(pParent, rResId)
- , sReadonly(SW_RESSTR(SW_STR_READONLY))
- , pDragEntry(0)
-{
- FreeResource();
- SetDragDropMode( SV_DRAGDROP_CTRL_MOVE|SV_DRAGDROP_CTRL_COPY );
-}
-
SwGlTreeListBox::SwGlTreeListBox(Window* pParent, WinBits nBits)
: SvTreeListBox(pParent, nBits)
, sReadonly(SW_RESSTR(SW_STR_READONLY)),
diff --git a/unusedcode.easy b/unusedcode.easy
index bb03e1e..c3aa2e9 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,4 +1,6 @@
Application::GetDisplayScreenName(unsigned int)
+EditTextObject::RemoveParaAttribs(unsigned short)
+EditTextObject::SetParaAttribs(unsigned long, SfxItemSet const&)
FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool)
Line::Intersection(Rectangle const&, Line&) const
PoHeader::PoHeader()
@@ -7,9 +9,9 @@ ScFiltersTest::testColorScaleODS()
ScFiltersTest::testColorScaleXLSX()
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
+StyleSettings::GetPersonaFooter() const
+TemplateAbstractView::deselectOverlayItem(unsigned short)
TextEngine::GetLeftMargin() const
-UnoControl::UnoControl()
-VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(Size const&, Fraction const&, Point const&, boost::shared_array<unsigned char> const&)
Window::PostUserEvent(unsigned long&, unsigned long, void*)
XclExpPivotCache::GetFieldAcc(rtl::OUString const&)
apitest::XCellRangesQuery::testQueryFormulaCells()
diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx
index 344dba9..edc3a38 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -156,7 +156,6 @@ void FilterConfigCache::ImplInit()
{
OUString STYPE ( "Type" );
OUString SUINAME ( "UIName" );
- OUString SUICOMPONENT ( "UIComponent" );
OUString SFLAGS ( "Flags" );
OUString SMEDIATYPE ( "MediaType" );
OUString SEXTENSIONS ( "Extensions" );
@@ -196,10 +195,6 @@ void FilterConfigCache::ImplInit()
if (lFlags[0].equalsIgnoreAsciiCase("export"))
aEntry.nFlags = 2;
- OUString sUIComponent;
- xFilterSet->getPropertyValue(SUICOMPONENT) >>= sUIComponent;
- aEntry.bHasDialog = sUIComponent.getLength();
-
::rtl::OUString sFormatName;
xFilterSet->getPropertyValue(SFORMATNAME) >>= sFormatName;
aEntry.CreateFilterName( sFormatName );
@@ -552,11 +547,6 @@ sal_Bool FilterConfigCache::IsExportPixelFormat( sal_uInt16 nFormat )
return (nFormat < aExport.size()) && aExport[ nFormat ].bIsPixelFormat;
}
-sal_Bool FilterConfigCache::IsExportDialog( sal_uInt16 nFormat )
-{
- return (nFormat < aExport.size()) && aExport[ nFormat ].bHasDialog;
-}
-
// ------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx
index 829122f..df1cc10 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -49,7 +49,6 @@ class FilterConfigCache
// user data
String sFilterName;
- sal_Bool bHasDialog : 1;
sal_Bool bIsInternalFilter : 1;
sal_Bool bIsPixelFormat : 1;
@@ -119,7 +118,6 @@ public:
sal_Bool IsExportInternalFilter( sal_uInt16 nFormat );
sal_Bool IsExportPixelFormat( sal_uInt16 nFormat );
- sal_Bool IsExportDialog( sal_uInt16 nFormat );
FilterConfigCache( sal_Bool bUseConfig );
~FilterConfigCache();
commit 62188aac68b30affbe144f8bd06f346f0e749cf9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jan 13 09:29:01 2013 +0000
grotesque TextControlCombo can now go with widget layout
Change-Id: Iced5ea01d08101173ede4d5676bcbd95084e3ea7
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 47e55be..e31e119 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -692,7 +692,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/ui/utlui/numfmtlb \
sw/source/ui/utlui/prcntfld \
sw/source/ui/utlui/shdwcrsr \
- sw/source/ui/utlui/textcontrolcombo \
sw/source/ui/utlui/tmplctrl \
sw/source/ui/utlui/uiitems \
sw/source/ui/utlui/uitool \
diff --git a/sw/source/ui/inc/convert.hxx b/sw/source/ui/inc/convert.hxx
index d52a965..aa53428 100644
--- a/sw/source/ui/inc/convert.hxx
+++ b/sw/source/ui/inc/convert.hxx
@@ -23,7 +23,6 @@
#include <vcl/button.hxx>
#include <vcl/edit.hxx>
#include <sfx2/basedlgs.hxx>
-#include <textcontrolcombo.hxx>
class SwTableAutoFmt;
class SwView;
diff --git a/sw/source/ui/inc/instable.hxx b/sw/source/ui/inc/instable.hxx
index fe7283d..00a3155 100644
--- a/sw/source/ui/inc/instable.hxx
+++ b/sw/source/ui/inc/instable.hxx
@@ -25,7 +25,6 @@
#include <vcl/layout.hxx>
#include <sfx2/basedlgs.hxx>
#include <actctrl.hxx>
-#include <textcontrolcombo.hxx>
class SwWrtShell;
class SwTableAutoFmt;
diff --git a/sw/source/ui/inc/textcontrolcombo.hxx b/sw/source/ui/inc/textcontrolcombo.hxx
deleted file mode 100644
index f608ab5..0000000
--- a/sw/source/ui/inc/textcontrolcombo.hxx
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 regarding copyright
- * ownership. The ASF licenses this file 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 .
- */
-
-#ifndef _TEXTCONTROLCOMBO_HXX
-#define _TEXTCONTROLCOMBO_HXX
-
-#include <vcl/fixed.hxx>
-
-#include <vcl/field.hxx>
-#include "swdllapi.h"
-
-class SW_DLLPUBLIC TextControlCombo : public Window
-{
-protected:
-
- Control& mrCtrl;
- FixedText& mrFTbefore;
- FixedText& mrFTafter;
-
-public:
-
- using Window::Enable;
- using Window::Disable;
-
- TextControlCombo( Window* _pParent, const ResId& _rResId,
- Control& _rCtrl, FixedText& _rFTbefore, FixedText& _rFTafter );
- virtual ~TextControlCombo();
-
- void Arrange( FixedText& _rOrg, sal_Bool bShow = true );
-
- // identical to window functionality
- void Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = 0 );
- void Hide( sal_uInt16 nFlags = 0 ) { Show( sal_False, nFlags ); }
-
- void Enable( sal_Bool bEnable = sal_True, sal_Bool bChild = sal_True );
- void Disable( sal_Bool bChild = sal_True ) { Enable( sal_False, bChild ); }
-};
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx
index 3515bce..091754d 100644
--- a/sw/source/ui/table/tablepg.hxx
+++ b/sw/source/ui/table/tablepg.hxx
@@ -25,7 +25,6 @@
#include <actctrl.hxx>
#include "prcntfld.hxx"
#include "swtypes.hxx"
-#include "textcontrolcombo.hxx"
class SwWrtShell;
class SwTableRep;
diff --git a/sw/source/ui/utlui/textcontrolcombo.cxx b/sw/source/ui/utlui/textcontrolcombo.cxx
deleted file mode 100644
index 860d027..0000000
--- a/sw/source/ui/utlui/textcontrolcombo.cxx
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 regarding copyright
- * ownership. The ASF licenses this file 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 .
- */
-
-#include "textcontrolcombo.hxx"
-
-
-TextControlCombo::TextControlCombo( Window* _pParent, const ResId& _rResId,
- Control& _rCtrl, FixedText& _rFTbefore, FixedText& _rFTafter )
- :Window ( _pParent, _rResId )
- ,mrCtrl ( _rCtrl )
- ,mrFTbefore ( _rFTbefore )
- ,mrFTafter ( _rFTafter )
-{
-}
-
-TextControlCombo::~TextControlCombo()
-{
-}
-
-void TextControlCombo::Arrange( FixedText& _rFTcomplete, sal_Bool /*bShow*/ )
-{
- Point aBasePos( GetPosPixel() );
- Size aMetricVals( GetSizePixel() );
-
- long nTextHeight = _rFTcomplete.GetSizePixel().Height();
- long nCtrlHeight = mrCtrl.GetSizePixel().Height();
-
- // calc y positions / center vertical
- long nYFT = aBasePos.Y();
- long nYCtrl = nYFT;
- if( nCtrlHeight > nTextHeight )
- nYFT += aMetricVals.Height();
- else
- nYCtrl += aMetricVals.Height();
-
- // separate text parts
- const String aReplStr( RTL_CONSTASCII_USTRINGPARAM( "%POSITION_OF_CONTROL" ) );
- String aTxtBefore( _rFTcomplete.GetText() );
- String aTxtAfter;
- xub_StrLen nReplPos = aTxtBefore.Search( aReplStr );
- if( nReplPos != STRING_NOTFOUND )
- {
- xub_StrLen nStrStartAfter = nReplPos + aReplStr.Len();
- aTxtAfter = String( aTxtBefore, nStrStartAfter, aTxtBefore.Len() - nStrStartAfter );
- aTxtBefore.Erase( nReplPos );
- }
-
- // arrange and fill Fixed Texts
- long nX = aBasePos.X();
- long nWidth = GetTextWidth( aTxtBefore );
-
- mrFTbefore.SetText( aTxtBefore );
- mrFTbefore.setPosSizePixel( nX, nYFT, nWidth, nTextHeight );
-
- nX += nWidth;
- nX += aMetricVals.Width();
- mrCtrl.SetPosPixel( Point( nX, nYCtrl ) );
-
- nX += mrCtrl.GetSizePixel().Width();
- nX += aMetricVals.Width();
- mrFTafter.SetText( aTxtAfter );
- mrFTafter.setPosSizePixel( nX, nYFT, GetTextWidth( aTxtAfter ), nTextHeight );
-
- _rFTcomplete.Hide();
-
- Show();
-
- Window::Hide();
-}
-
-void TextControlCombo::Show( sal_Bool _bVisible, sal_uInt16 _nFlags )
-{
- mrCtrl.Show( _bVisible, _nFlags );
- mrFTbefore.Show( _bVisible, _nFlags );
- mrFTafter.Show( _bVisible, _nFlags );
-}
-
-void TextControlCombo::Enable( sal_Bool _bEnable, sal_Bool _bChild )
-{
- mrCtrl.Enable( _bEnable, _bChild );
- mrFTbefore.Enable( _bEnable, _bChild );
- mrFTafter.Enable( _bEnable, _bChild );
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list