Kaydet (Commit) f0b9a277 authored tarafından Caolán McNamara's avatar Caolán McNamara

make extensions XubString free

Change-Id: I0216d11ade872af889fc805e4c2a9241f7f230c5
üst fbe0e7c1
...@@ -104,7 +104,7 @@ void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureS ...@@ -104,7 +104,7 @@ void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureS
const OUString* pStringArray = (const OUString*)pStringSeq->getConstArray(); const OUString* pStringArray = (const OUString*)pStringSeq->getConstArray();
sal_uInt32 nCount = pStringSeq->getLength(); sal_uInt32 nCount = pStringSeq->getLength();
XubString aEntry; OUString aEntry;
for( sal_uInt32 i=0; i<nCount; i++ ) for( sal_uInt32 i=0; i<nCount; i++ )
{ {
aEntry = String(pStringArray[i]); aEntry = String(pStringArray[i]);
...@@ -113,8 +113,7 @@ void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureS ...@@ -113,8 +113,7 @@ void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureS
pToolBar->UpdateSourceList(sal_True); pToolBar->UpdateSourceList(sal_True);
} }
XubString aStr = String(rEvt.FeatureDescriptor); pToolBar->SelectSourceEntry(rEvt.FeatureDescriptor);
pToolBar->SelectSourceEntry(aStr);
} }
}; };
...@@ -219,7 +218,7 @@ BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle): ...@@ -219,7 +218,7 @@ BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle):
aEdQuery.SetSizePixel(aLBSource.GetSizePixel()); aEdQuery.SetSizePixel(aLBSource.GetSizePixel());
aEdQuery.Show(); aEdQuery.Show();
XubString aStr=GetItemText(TBC_FT_SOURCE); OUString aStr=GetItemText(TBC_FT_SOURCE);
Rectangle aRect=GetItemRect(TBC_FT_SOURCE); Rectangle aRect=GetItemRect(TBC_FT_SOURCE);
aFtSource.SetText(aStr); aFtSource.SetText(aStr);
aFtSource.SetSizePixel(aRect.GetSize()); aFtSource.SetSizePixel(aRect.GetSize());
...@@ -377,7 +376,7 @@ void BibToolBar::ClearFilterMenu() ...@@ -377,7 +376,7 @@ void BibToolBar::ClearFilterMenu()
aPopupMenu.Clear(); aPopupMenu.Clear();
nMenuId=0; nMenuId=0;
} }
sal_uInt16 BibToolBar::InsertFilterItem(const XubString& aMenuEntry) sal_uInt16 BibToolBar::InsertFilterItem(const OUString& aMenuEntry)
{ {
nMenuId++; nMenuId++;
aPopupMenu.InsertItem(nMenuId,aMenuEntry); aPopupMenu.InsertItem(nMenuId,aMenuEntry);
...@@ -407,12 +406,12 @@ void BibToolBar::UpdateSourceList(sal_Bool bFlag) ...@@ -407,12 +406,12 @@ void BibToolBar::UpdateSourceList(sal_Bool bFlag)
aLBSource.SetUpdateMode(bFlag); aLBSource.SetUpdateMode(bFlag);
} }
void BibToolBar::InsertSourceEntry(const XubString& aEntry, sal_uInt16 nPos) void BibToolBar::InsertSourceEntry(const OUString& aEntry, sal_uInt16 nPos)
{ {
aLBSource.InsertEntry(aEntry, nPos); aLBSource.InsertEntry(aEntry, nPos);
} }
void BibToolBar::SelectSourceEntry(const XubString& aStr) void BibToolBar::SelectSourceEntry(const OUString& aStr)
{ {
aLBSource.SelectEntry(aStr); aLBSource.SelectEntry(aStr);
} }
...@@ -423,7 +422,7 @@ void BibToolBar::EnableQuery(sal_Bool bFlag) ...@@ -423,7 +422,7 @@ void BibToolBar::EnableQuery(sal_Bool bFlag)
aEdQuery.Enable(bFlag); aEdQuery.Enable(bFlag);
} }
void BibToolBar::SetQueryString(const XubString& aStr) void BibToolBar::SetQueryString(const OUString& aStr)
{ {
aEdQuery.SetText(aStr); aEdQuery.SetText(aStr);
} }
......
...@@ -156,15 +156,15 @@ class BibToolBar: public ToolBox ...@@ -156,15 +156,15 @@ class BibToolBar: public ToolBox
void ClearSourceList(); void ClearSourceList();
void UpdateSourceList(sal_Bool bFlag=sal_True); void UpdateSourceList(sal_Bool bFlag=sal_True);
void EnableSourceList(sal_Bool bFlag=sal_True); void EnableSourceList(sal_Bool bFlag=sal_True);
void InsertSourceEntry(const XubString&,sal_uInt16 nPos=LISTBOX_APPEND ); void InsertSourceEntry(const OUString&,sal_uInt16 nPos=LISTBOX_APPEND );
void SelectSourceEntry(const XubString& ); void SelectSourceEntry(const OUString& );
void EnableQuery(sal_Bool bFlag=sal_True); void EnableQuery(sal_Bool bFlag=sal_True);
void SetQueryString(const XubString& ); void SetQueryString(const OUString& );
void AdjustToolBox(); void AdjustToolBox();
void ClearFilterMenu(); void ClearFilterMenu();
sal_uInt16 InsertFilterItem(const XubString& ); sal_uInt16 InsertFilterItem(const OUString& );
void SelectFilterItem(sal_uInt16 nId); void SelectFilterItem(sal_uInt16 nId);
void statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) void statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
......
...@@ -256,7 +256,7 @@ namespace pcr ...@@ -256,7 +256,7 @@ namespace pcr
} }
//------------------------------------------------------------------ //------------------------------------------------------------------
void OBrowserLine::SetTitle(const XubString& _rNewTtile ) void OBrowserLine::SetTitle(const OUString& _rNewTtile )
{ {
if ( GetTitle() == _rNewTtile ) if ( GetTitle() == _rNewTtile )
return; return;
...@@ -291,7 +291,7 @@ namespace pcr ...@@ -291,7 +291,7 @@ namespace pcr
} }
//------------------------------------------------------------------ //------------------------------------------------------------------
XubString OBrowserLine::GetTitle() const OUString OBrowserLine::GetTitle() const
{ {
OUString sDisplayName = m_aFtTitle.GetText(); OUString sDisplayName = m_aFtTitle.GetText();
......
...@@ -85,9 +85,9 @@ namespace pcr ...@@ -85,9 +85,9 @@ namespace pcr
void SetComponentHelpIds( const OString& _rHelpId, const OString& _sPrimaryButtonId, const OString& _sSecondaryButtonId ); void SetComponentHelpIds( const OString& _rHelpId, const OString& _sPrimaryButtonId, const OString& _sSecondaryButtonId );
void SetTitle(const String& rString ); void SetTitle(const OUString& rString );
void FullFillTitleString(); void FullFillTitleString();
String GetTitle() const; OUString GetTitle() const;
void SetTitleWidth(sal_uInt16); void SetTitleWidth(sal_uInt16);
void SetPosSizePixel(Point aPos,Size aSize); void SetPosSizePixel(Point aPos,Size aSize);
......
...@@ -90,8 +90,8 @@ class BubbleWindow : public FloatingWindow ...@@ -90,8 +90,8 @@ class BubbleWindow : public FloatingWindow
Region maBounds; Region maBounds;
Polygon maRectPoly; Polygon maRectPoly;
Polygon maTriPoly; Polygon maTriPoly;
XubString maBubbleTitle; OUString maBubbleTitle;
XubString maBubbleText; OUString maBubbleText;
Image maBubbleImage; Image maBubbleImage;
Size maMaxTextSize; Size maMaxTextSize;
Rectangle maTitleRect; Rectangle maTitleRect;
...@@ -102,8 +102,8 @@ private: ...@@ -102,8 +102,8 @@ private:
void RecalcTextRects(); void RecalcTextRects();
public: public:
BubbleWindow( Window* pParent, const XubString& rTitle, BubbleWindow( Window* pParent, const OUString& rTitle,
const XubString& rText, const Image& rImage ); const OUString& rText, const Image& rImage );
~BubbleWindow(); ~BubbleWindow();
virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void MouseButtonDown( const MouseEvent& rMEvt );
...@@ -111,7 +111,7 @@ public: ...@@ -111,7 +111,7 @@ public:
void Resize(); void Resize();
void Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = SHOW_NOACTIVATE ); void Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = SHOW_NOACTIVATE );
void SetTipPosPixel( const Point& rTipPos ) { maTipPos = rTipPos; } void SetTipPosPixel( const Point& rTipPos ) { maTipPos = rTipPos; }
void SetTitleAndText( const XubString& rTitle, const XubString& rText, void SetTitleAndText( const OUString& rTitle, const OUString& rText,
const Image& rImage ); const Image& rImage );
}; };
...@@ -552,15 +552,12 @@ BubbleWindow * UpdateCheckUI::GetBubbleWindow() ...@@ -552,15 +552,12 @@ BubbleWindow * UpdateCheckUI::GetBubbleWindow()
BubbleWindow* pBubbleWin = mpBubbleWin; BubbleWindow* pBubbleWin = mpBubbleWin;
if ( !pBubbleWin ) { if ( !pBubbleWin ) {
pBubbleWin = new BubbleWindow( mpIconSysWin, pBubbleWin = new BubbleWindow( mpIconSysWin, maBubbleTitle,
XubString( maBubbleTitle ), maBubbleText, maBubbleImage );
XubString( maBubbleText ),
maBubbleImage );
mbBubbleChanged = false; mbBubbleChanged = false;
} }
else if ( mbBubbleChanged ) { else if ( mbBubbleChanged ) {
pBubbleWin->SetTitleAndText( XubString( maBubbleTitle ), pBubbleWin->SetTitleAndText( maBubbleTitle, maBubbleText,
XubString( maBubbleText ),
maBubbleImage ); maBubbleImage );
mbBubbleChanged = false; mbBubbleChanged = false;
} }
...@@ -784,8 +781,8 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent *, pEvent) ...@@ -784,8 +781,8 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent *, pEvent)
#define TEXT_MAX_HEIGHT 200 #define TEXT_MAX_HEIGHT 200
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
BubbleWindow::BubbleWindow( Window* pParent, const XubString& rTitle, BubbleWindow::BubbleWindow( Window* pParent, const OUString& rTitle,
const XubString& rText, const Image& rImage ) const OUString& rText, const Image& rImage )
: FloatingWindow( pParent, WB_SYSTEMWINDOW : FloatingWindow( pParent, WB_SYSTEMWINDOW
| WB_OWNERDRAWDECORATION | WB_OWNERDRAWDECORATION
| WB_NOBORDER | WB_NOBORDER
...@@ -836,8 +833,8 @@ void BubbleWindow::Resize() ...@@ -836,8 +833,8 @@ void BubbleWindow::Resize()
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void BubbleWindow::SetTitleAndText( const XubString& rTitle, void BubbleWindow::SetTitleAndText( const OUString& rTitle,
const XubString& rText, const OUString& rText,
const Image& rImage ) const Image& rImage )
{ {
maBubbleTitle = rTitle; maBubbleTitle = rTitle;
...@@ -905,7 +902,7 @@ void BubbleWindow::Show( sal_Bool bVisible, sal_uInt16 nFlags ) ...@@ -905,7 +902,7 @@ void BubbleWindow::Show( sal_Bool bVisible, sal_uInt16 nFlags )
} }
// don't show bubbles without a text // don't show bubbles without a text
if ( ( maBubbleTitle.Len() == 0 ) && ( maBubbleText.Len() == 0 ) ) if ( ( maBubbleTitle.isEmpty() ) && ( maBubbleText.isEmpty() ) )
return; return;
Size aWindowSize = GetSizePixel(); Size aWindowSize = GetSizePixel();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment