diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:57:32 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:57:32 -0600 |
| commit | eb90ab5a73149323b50f18a02968fbdcee539236 (patch) | |
| tree | a1b812f444fd30bdd7882faaf9826c85980deed7 | |
| parent | f9c53ad052cb31b8ff2727526651a79f333e3bf6 (diff) | |
fix mis-merge all-around.
105 files changed, 306 insertions, 1799 deletions
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx index 2326152613..2ad8689b2a 100755 --- a/avmedia/source/framework/mediaitem.cxx +++ b/avmedia/source/framework/mediaitem.cxx @@ -123,7 +123,7 @@ SfxItemPresentation MediaItem::GetPresentation( SfxItemPresentation, //------------------------------------------------------------------------ -bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const +bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const { uno::Sequence< uno::Any > aSeq( 9 ); @@ -144,7 +144,7 @@ bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const //------------------------------------------------------------------------ -bool MediaItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) +bool MediaItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) { uno::Sequence< uno::Any > aSeq; bool bRet = false; diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index e0c901e580..8d7bed51d4 100755 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -228,7 +228,6 @@ void MediaWindowImpl::cleanUp() void MediaWindowImpl::onURLChanged() { -{ if( getPlayer().is() ) { uno::Sequence< uno::Any > aArgs( 3 ); diff --git a/avmedia/source/viewer/mediawindowbase_impl.hxx b/avmedia/source/viewer/mediawindowbase_impl.hxx index 9cfa52e005..408528e209 100755 --- a/avmedia/source/viewer/mediawindowbase_impl.hxx +++ b/avmedia/source/viewer/mediawindowbase_impl.hxx @@ -62,8 +62,7 @@ namespace avmedia virtual void cleanUp(); virtual void onURLChanged(); - static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const ::rtl::OUString& rURL, - sal_Bool& rbJavaBased ); + static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const ::rtl::OUString& rURL); public: diff --git a/configmgr/source/defaultprovider.cxx b/configmgr/source/defaultprovider.cxx index 6e65301e8c..c938e2b319 100755 --- a/configmgr/source/defaultprovider.cxx +++ b/configmgr/source/defaultprovider.cxx @@ -43,14 +43,12 @@ namespace configmgr { namespace default_provider { -namespace { - namespace css = com::sun::star; css::uno::Reference< css::uno::XInterface > create( css::uno::Reference< css::uno::XComponentContext > const & context) { - osl::MutexGuard guard(*lock_); + osl::MutexGuard guard(*lock()); static css::uno::Reference< css::uno::XInterface > singleton( configuration_provider::createDefault(context)); return singleton; diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 5efa94ee78..19648d472c 100755 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -272,7 +272,7 @@ namespace drawinglayer nChars = nWidthToFill / nWidth; String aFilled; - aFilled.Fill( (USHORT)nChars, aText.GetChar( 0 ) ); + aFilled.Fill( (sal_uInt16)nChars, aText.GetChar( 0 ) ); aText = aFilled; nPos = 0; nLen = nChars; diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 9213abedd3..d54a7ce5f7 100755 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -155,8 +155,8 @@ $(eval $(call gb_Library_add_linked_libs,editeng,\ ucbhelper \ cppuhelper \ cppu \ - vos3 \ sal \ + salhelper \ icuuc \ i18nisolang1 \ i18npaper \ diff --git a/editeng/inc/editeng/bolnitem.hxx b/editeng/inc/editeng/bolnitem.hxx index aa6bcbf6a1..8222c5dbdc 100755 --- a/editeng/inc/editeng/bolnitem.hxx +++ b/editeng/inc/editeng/bolnitem.hxx @@ -66,8 +66,8 @@ public: String &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; virtual bool ScaleMetrics( long nMult, long nDiv ); virtual bool HasMetrics() const; diff --git a/editeng/inc/editeng/boxitem.hxx b/editeng/inc/editeng/boxitem.hxx index eb3cbc1ec6..8f17d14ee5 100755 --- a/editeng/inc/editeng/boxitem.hxx +++ b/editeng/inc/editeng/boxitem.hxx @@ -106,7 +106,7 @@ public: // Line width plus Space plus inward distance //bIgnoreLine = TRUE -> Also return distance, when no Line is set sal_uInt16 CalcLineSpace( sal_uInt16 nLine, sal_Bool bIgnoreLine = sal_False ) const; - static com::sun::star::table::BorderLine SvxLineToLine( const SvxBorderLine* pLine, sal_Bool bConvert ); + static com::sun::star::table::BorderLine2 SvxLineToLine( const SvxBorderLine* pLine, sal_Bool bConvert ); static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert); static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert); }; @@ -191,8 +191,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; - virtual int ScaleMetrics( long nMult, long nDiv ); - virtual int HasMetrics() const; + virtual bool ScaleMetrics( long nMult, long nDiv ); + virtual bool HasMetrics() const; const SvxBorderLine* GetHori() const { return pHori; } const SvxBorderLine* GetVert() const { return pVert; } diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx index b1a2e18b78..02fc25ed8a 100755 --- a/editeng/inc/editeng/editeng.hxx +++ b/editeng/inc/editeng/editeng.hxx @@ -124,7 +124,7 @@ private: EDITENG_DLLPRIVATE EditEngine( const EditEngine& ); EDITENG_DLLPRIVATE EditEngine& operator=( const EditEngine& ); - EDITENG_DLLPRIVATE sal_Bool PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView ); + EDITENG_DLLPRIVATE sal_uInt8 PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, Window* pFrameWin = NULL ); protected: diff --git a/editeng/inc/editeng/justifyitem.hxx b/editeng/inc/editeng/justifyitem.hxx index f6516cec22..67f8dc2e0e 100755 --- a/editeng/inc/editeng/justifyitem.hxx +++ b/editeng/inc/editeng/justifyitem.hxx @@ -39,11 +39,11 @@ class EDITENG_DLLPUBLIC SvxHorJustifyItem: public SfxEnumItem public: TYPEINFO(); - SvxHorJustifyItem( const USHORT nId ); + SvxHorJustifyItem( const sal_uInt16 nId ); SvxHorJustifyItem( const SvxCellHorJustify eJustify /*= SVX_HOR_JUSTIFY_STANDARD*/, - const USHORT nId ); + const sal_uInt16 nId ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -53,10 +53,10 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual USHORT GetValueCount() const; - virtual String GetValueText( USHORT nVal ) const; + virtual sal_uInt16 GetValueCount() const; + virtual String GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; inline SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify) { @@ -72,11 +72,11 @@ class EDITENG_DLLPUBLIC SvxVerJustifyItem: public SfxEnumItem public: TYPEINFO(); - SvxVerJustifyItem( const USHORT nId ); + SvxVerJustifyItem( const sal_uInt16 nId ); SvxVerJustifyItem( const SvxCellVerJustify eJustify /*= SVX_VER_JUSTIFY_STANDARD*/, - const USHORT nId ); + const sal_uInt16 nId ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -86,10 +86,10 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual USHORT GetValueCount() const; - virtual String GetValueText( USHORT nVal ) const; + virtual sal_uInt16 GetValueCount() const; + virtual String GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; inline SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify) { @@ -103,11 +103,11 @@ public: class EDITENG_DLLPUBLIC SvxJustifyMethodItem: public SfxEnumItem { public: - SvxJustifyMethodItem( const USHORT nId ); + SvxJustifyMethodItem( const sal_uInt16 nId ); SvxJustifyMethodItem( const SvxCellJustifyMethod eMethod, - const USHORT nId ); + const sal_uInt16 nId ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -117,10 +117,10 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual USHORT GetValueCount() const; - virtual String GetValueText( USHORT nVal ) const; + virtual sal_uInt16 GetValueCount() const; + virtual String GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; SvxJustifyMethodItem& operator=(const SvxJustifyMethodItem& r); }; diff --git a/editeng/inc/editeng/lrspitem.hxx b/editeng/inc/editeng/lrspitem.hxx index d6d51b5deb..68a9fa5ba9 100755 --- a/editeng/inc/editeng/lrspitem.hxx +++ b/editeng/inc/editeng/lrspitem.hxx @@ -66,7 +66,7 @@ namespace rtl class EDITENG_DLLPUBLIC SvxLRSpaceItem : public SfxPoolItem { short nFirstLineOfst; // First-line indent _always_ relative to nTxtLeft - long nTxtLeft; // We spend a USHORT + long nTxtLeft; // We spend a sal_uInt16 long nLeftMargin; // nLeft or the negative first-line indent long nRightMargin; // The unproblematic right edge diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx index d01ea40ef4..022c40cd56 100755 --- a/editeng/inc/editeng/outliner.hxx +++ b/editeng/inc/editeng/outliner.hxx @@ -900,7 +900,7 @@ public: virtual void DrawingTab( const Point& rStartPos, long nWidth, const String& rChar, - const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft, + const SvxFont& rFont, sal_uInt16 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft, bool bEndOfLine, bool bEndOfParagraph, const Color& rOverlineColor, diff --git a/editeng/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx index ac10b3ad11..1bc75b0816 100755 --- a/editeng/inc/editeng/svxacorr.hxx +++ b/editeng/inc/editeng/svxacorr.hxx @@ -251,7 +251,7 @@ public: // Execute an AutoCorrect. // Returns what has been executed, according to the above flags sal_uLong AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, - xub_StrLen nPos, sal_Unicode cInsChar, sal_Bool bInsert ); + xub_StrLen nPos, sal_Unicode cInsChar, sal_Bool bInsert, Window* pFrameWin = NULL ); // Return for the autotext expansion the previous word, // AutoCorrect - corresponding algorithm diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index 85312b11ee..de5174738e 100755 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -187,7 +187,7 @@ private: public: ItemList(); - const SfxPoolItem* FindAttrib( USHORT nWhich ); + const SfxPoolItem* FindAttrib( sal_uInt16 nWhich ); const SfxPoolItem* First(); const SfxPoolItem* Next(); size_t Count() { return aItemPool.size(); }; diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index d8bddb6abf..ef10e8bfe7 100755 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2440,8 +2440,8 @@ void EditEngine::DrawingText( const Point&, const XubString&, sal_uInt16, sal_uI void EditEngine::DrawingTab( const Point& /*rStartPos*/, long /*nWidth*/, const String& /*rChar*/, const SvxFont& /*rFont*/, - USHORT /*nPara*/, xub_StrLen /*nIndex*/, - BYTE /*nRightToLeft*/, bool /*bEndOfLine*/, + sal_uInt16 /*nPara*/, xub_StrLen /*nIndex*/, + sal_uInt8 /*nRightToLeft*/, bool /*bEndOfLine*/, bool /*bEndOfParagraph*/, const Color& /*rOverlineColor*/, const Color& /*rTextLineColor*/) { diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index c34d540188..b06d3df824 100755 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -650,8 +650,8 @@ void EditHTMLParser::ImpSetStyleSheet( sal_uInt16 nHLevel ) if ( !nHLevel || ((nHLevel >= 1) && (nHLevel <= 6)) ) { SvxULSpaceItem aULSpaceItem( EE_PARA_ULSPACE ); - aULSpaceItem.SetUpper( (USHORT)OutputDevice::LogicToLogic( 42, MAP_10TH_MM, eUnit ) ); - aULSpaceItem.SetLower( (USHORT)OutputDevice::LogicToLogic( 35, MAP_10TH_MM, eUnit ) ); + aULSpaceItem.SetUpper( (sal_uInt16)OutputDevice::LogicToLogic( 42, MAP_10TH_MM, eUnit ) ); + aULSpaceItem.SetLower( (sal_uInt16)OutputDevice::LogicToLogic( 35, MAP_10TH_MM, eUnit ) ); aItems.Put( aULSpaceItem ); } } diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 45b64cb328..327ecdbba3 100755 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -990,7 +990,7 @@ public: sal_Int32 GetSpaceBeforeAndMinLabelWidth( const ContentNode *pNode, sal_Int32 *pnSpaceBefore = 0, sal_Int32 *pnMinLabelWidth = 0 ) const; const SvxLRSpaceItem& GetLRSpaceItem( ContentNode* pNode ); - SvxAdjust GetJustification( USHORT nPara ) const; + SvxAdjust GetJustification( sal_uInt16 nPara ) const; SvxCellJustifyMethod GetJustifyMethod( sal_uInt16 nPara ) const; SvxCellVerJustify GetVerJustification( sal_uInt16 nPara ) const; diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 4a6bb9ce0c..dd133e4a12 100755 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -1675,7 +1675,7 @@ void ImpEditEngine::InitScriptTypes( sal_uInt16 nPara ) { ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara ); ScriptTypePosInfos& rTypes = pParaPortion->aScriptInfos; - rTypes.Remove( 0, rTypes.Count() ); + rTypes.clear(); ContentNode* pNode = pParaPortion->GetNode(); if ( pNode->Len() ) @@ -2088,14 +2088,14 @@ SvxAdjust ImpEditEngine::GetJustification( sal_uInt16 nPara ) const return eJustification; } -SvxCellJustifyMethod ImpEditEngine::GetJustifyMethod( USHORT nPara ) const +SvxCellJustifyMethod ImpEditEngine::GetJustifyMethod( sal_uInt16 nPara ) const { const SvxJustifyMethodItem& rItem = static_cast<const SvxJustifyMethodItem&>( GetParaAttrib(nPara, EE_PARA_JUST_METHOD)); return static_cast<SvxCellJustifyMethod>(rItem.GetEnumValue()); } -SvxCellVerJustify ImpEditEngine::GetVerJustification( USHORT nPara ) const +SvxCellVerJustify ImpEditEngine::GetVerJustification( sal_uInt16 nPara ) const { const SvxVerJustifyItem& rItem = static_cast<const SvxVerJustifyItem&>( GetParaAttrib(nPara, EE_PARA_VER_JUST)); @@ -2539,8 +2539,8 @@ void ImpEditEngine::ImpRemoveParagraph( sal_uInt16 nPara ) } } -EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c, - bool bOverwrite, Window* pFrameWin ) +EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c, + sal_Bool bOverwrite, Window* pFrameWin ) { EditSelection aSel( rCurSel ); #ifndef SVX_LIGHT diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 170c05af01..91884d49f3 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -2013,7 +2013,7 @@ void ImpEditEngine::ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine, { EditPaM aPaM( pNode, nChar+1 ); LanguageType eLang = GetLanguage(aPaM); - USHORT nScript = GetScriptType(aPaM); + sal_uInt16 nScript = GetScriptType(aPaM); if ( MsLangId::getPrimaryLanguage( eLang) == LANGUAGE_ARABIC_PRIMARY_ONLY ) // Arabic script is handled later. continue; @@ -2083,13 +2083,12 @@ void ImpEditEngine::ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine, // Letztes Zeichen wird schon nicht mehr beachtet... for ( sal_uInt16 n = 0; n < aPositions.Count(); n++ ) { - USHORT nChar = aPositions[n]; + sal_uInt16 nChar = aPositions[n]; if ( nChar < nLastChar ) { sal_uInt16 nPortionStart, nPortion; nPortion = pParaPortion->GetTextPortions().FindPortion( nChar, nPortionStart, true ); TextPortion* pLastPortion = pParaPortion->GetTextPortions()[ nPortion ]; - USHORT nPortionEnd = nPortionStart + pLastPortion->GetLen(); // Die Breite der Portion: pLastPortion->GetSize().Width() += nMore4Everyone; diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 2730b00c93..d5042e8065 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -1563,10 +1563,10 @@ void SvxShadowItem::SetEnumValue( sal_uInt16 nVal ) SvxBorderLine::SvxBorderLine( const Color *pCol, sal_uInt16 nOut, sal_uInt16 nIn, sal_uInt16 nDist, SvxBorderStyle nStyle ) -: nOutWidth( nOut ) +: m_nStyle( nStyle ) +, nOutWidth( nOut ) , nInWidth ( nIn ) , nDistance( nDist ) -, m_nStyle( nStyle ) { if ( pCol ) aColor = *pCol; @@ -1935,7 +1935,8 @@ sal_Bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rL return lcl_lineToSvxLine(rLine, rSvxLine, bConvert); } -bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +sal_Bool +SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert) { const bool bRet(lcl_lineToSvxLine(rLine, rSvxLine, bConvert)); @@ -1983,7 +1984,7 @@ lcl_extractBorderLine(const uno::Any& rAny, table::BorderLine2& rLine) template<typename Item> bool -lcl_setLine(const uno::Any& rAny, Item& rItem, USHORT nLine, const bool bConvert) +lcl_setLine(const uno::Any& rAny, Item& rItem, sal_uInt16 nLine, const bool bConvert) { bool bDone = false; table::BorderLine2 aBorderLine; @@ -1999,7 +2000,7 @@ lcl_setLine(const uno::Any& rAny, Item& rItem, USHORT nLine, const bool bConvert } -bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) +bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); sal_uInt16 nLine = BOX_LINE_TOP; diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index 1256c4b77d..c8f4c7c3e1 100755 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -52,14 +52,14 @@ using namespace ::com::sun::star; -SvxHorJustifyItem::SvxHorJustifyItem( const USHORT nId ) : - SfxEnumItem( nId, (USHORT)SVX_HOR_JUSTIFY_STANDARD ) +SvxHorJustifyItem::SvxHorJustifyItem( const sal_uInt16 nId ) : + SfxEnumItem( nId, (sal_uInt16)SVX_HOR_JUSTIFY_STANDARD ) { } SvxHorJustifyItem::SvxHorJustifyItem( const SvxCellHorJustify eJustify, - const USHORT nId ) : - SfxEnumItem( nId, (USHORT)eJustify ) + const sal_uInt16 nId ) : + SfxEnumItem( nId, (sal_uInt16)eJustify ) { } @@ -155,7 +155,7 @@ bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) case table::CellHoriJustify_REPEAT: eSvx = SVX_HOR_JUSTIFY_REPEAT; break; default: ; //prevent warning } - SetValue( (USHORT)eSvx ); + SetValue( (sal_uInt16)eSvx ); } break; case MID_HORJUST_ADJUST: @@ -175,14 +175,14 @@ bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) case style::ParagraphAdjust_BLOCK: eSvx = SVX_HOR_JUSTIFY_BLOCK; break; case style::ParagraphAdjust_CENTER: eSvx = SVX_HOR_JUSTIFY_CENTER; break; } - SetValue( (USHORT)eSvx ); + SetValue( (sal_uInt16)eSvx ); } } return true; } -XubString SvxHorJustifyItem::GetValueText( USHORT nVal ) const +XubString SvxHorJustifyItem::GetValueText( sal_uInt16 nVal ) const { DBG_ASSERT( nVal <= SVX_HOR_JUSTIFY_REPEAT, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_HORJUST_STANDARD + nVal); @@ -195,28 +195,28 @@ SfxPoolItem* SvxHorJustifyItem::Clone( SfxItemPool* ) const } -SfxPoolItem* SvxHorJustifyItem::Create( SvStream& rStream, USHORT ) const +SfxPoolItem* SvxHorJustifyItem::Create( SvStream& rStream, sal_uInt16 ) const { - USHORT nVal; + sal_uInt16 nVal; rStream >> nVal; return new SvxHorJustifyItem( (SvxCellHorJustify)nVal, Which() ); } -USHORT SvxHorJustifyItem::GetValueCount() const +sal_uInt16 SvxHorJustifyItem::GetValueCount() const { return SVX_HOR_JUSTIFY_REPEAT + 1; // Last Enum value + 1 } -SvxVerJustifyItem::SvxVerJustifyItem( const USHORT nId ) : - SfxEnumItem( nId, (USHORT)SVX_VER_JUSTIFY_STANDARD ) +SvxVerJustifyItem::SvxVerJustifyItem( const sal_uInt16 nId ) : + SfxEnumItem( nId, (sal_uInt16)SVX_VER_JUSTIFY_STANDARD ) { } SvxVerJustifyItem::SvxVerJustifyItem( const SvxCellVerJustify eJustify, - const USHORT nId ) : - SfxEnumItem( nId, (USHORT)eJustify ) + const sal_uInt16 nId ) : + SfxEnumItem( nId, (sal_uInt16)eJustify ) { } @@ -301,7 +301,7 @@ bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) case style::VerticalAlignment_BOTTOM: eSvx = SVX_VER_JUSTIFY_BOTTOM; break; default:; } - SetValue( (USHORT)eSvx ); + SetValue( (sal_uInt16)eSvx ); break; } default: @@ -319,7 +319,7 @@ bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) case table::CellVertJustify2::BLOCK: eSvx = SVX_VER_JUSTIFY_BLOCK; break; default: ; //prevent warning } - SetValue( (USHORT)eSvx ); + SetValue( (sal_uInt16)eSvx ); break; } } @@ -328,7 +328,7 @@ bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } -XubString SvxVerJustifyItem::GetValueText( USHORT nVal ) const +XubString SvxVerJustifyItem::GetValueText( sal_uInt16 nVal ) const { DBG_ASSERT( nVal <= SVX_VER_JUSTIFY_BOTTOM, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_VERJUST_STANDARD + nVal); @@ -341,29 +341,29 @@ SfxPoolItem* SvxVerJustifyItem::Clone( SfxItemPool* ) const } -SfxPoolItem* SvxVerJustifyItem::Create( SvStream& rStream, USHORT ) const +SfxPoolItem* SvxVerJustifyItem::Create( SvStream& rStream, sal_uInt16 ) const { - USHORT nVal; + sal_uInt16 nVal; rStream >> nVal; return new SvxVerJustifyItem( (SvxCellVerJustify)nVal, Which() ); } -USHORT SvxVerJustifyItem::GetValueCount() const +sal_uInt16 SvxVerJustifyItem::GetValueCount() const { return SVX_VER_JUSTIFY_BOTTOM + 1; // Last Enum value + 1 } -SvxJustifyMethodItem::SvxJustifyMethodItem( const USHORT nId ) : - SfxEnumItem( nId, (USHORT)SVX_JUSTIFY_METHOD_AUTO ) +SvxJustifyMethodItem::SvxJustifyMethodItem( const sal_uInt16 nId ) : + SfxEnumItem( nId, (sal_uInt16)SVX_JUSTIFY_METHOD_AUTO ) { } SvxJustifyMethodItem::SvxJustifyMethodItem( const SvxCellJustifyMethod eJustify, - const USHORT nId ) : - SfxEnumItem( nId, (USHORT)eJustify ) + const sal_uInt16 nId ) : + SfxEnumItem( nId, (sal_uInt16)eJustify ) { } @@ -421,12 +421,12 @@ bool SvxJustifyMethodItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId break; default:; } - SetValue(static_cast<USHORT>(eSvx)); + SetValue(static_cast<sal_uInt16>(eSvx)); return true; } -XubString SvxJustifyMethodItem::GetValueText( USHORT nVal ) const +XubString SvxJustifyMethodItem::GetValueText( sal_uInt16 nVal ) const { DBG_ASSERT( nVal <= SVX_VER_JUSTIFY_BOTTOM, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_JUSTMETHOD_AUTO + nVal); @@ -439,15 +439,15 @@ SfxPoolItem* SvxJustifyMethodItem::Clone( SfxItemPool* ) const } -SfxPoolItem* SvxJustifyMethodItem::Create( SvStream& rStream, USHORT ) const +SfxPoolItem* SvxJustifyMethodItem::Create( SvStream& rStream, sal_uInt16 ) const { - USHORT nVal; + sal_uInt16 nVal; rStream >> nVal; return new SvxJustifyMethodItem( (SvxCellJustifyMethod)nVal, Which() ); } -USHORT SvxJustifyMethodItem::GetValueCount() const +sal_uInt16 SvxJustifyMethodItem::GetValueCount() const { return SVX_JUSTIFY_METHOD_DISTRIBUTE + 1; // Last Enum value + 1 } diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 280f427e7a..d6a8f01aba 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -614,7 +614,7 @@ int SvxPostureItem::HasBoolValue() const // ----------------------------------------------------------------------- -BOOL SvxPostureItem::GetBoolValue() const +sal_Bool SvxPostureItem::GetBoolValue() const { return ( (FontItalic)GetValue() >= ITALIC_OBLIQUE ); } diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 052b4b4688..a73452059b 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -669,7 +669,7 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace( ; if(INetURLObject::CompareProtocolScheme(rTxt.Copy(nSttWdPos + (bWasWordDelim ? 1 : 0), nEndPos - nSttWdPos + 1)) != INET_PROT_NOT_VALID) { - return FALSE; + return sal_False; } diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx index 0204d60f42..43a1f44cab 100644 --- a/editeng/source/misc/txtrange.cxx +++ b/editeng/source/misc/txtrange.cxx @@ -305,7 +305,7 @@ void SvxBoundArgs::NoteRange( sal_Bool bToggle ) aBoolArr.erase( aBoolArr.begin() + nMaxIdx, aBoolArr.begin() + (nMaxIdx + nDiff) ); } DBG_ASSERT( nMaxIdx < aBoolArr.size(), "NoteRange: Too much deleted" ); - aBoolArr[ nMaxIdx ] ^= bToggle; + aBoolArr[ nMaxIdx ] = aBoolArr[ nMaxIdx ] ^ bToggle; } } diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx index b6ddc7bd11..cbe254c845 100755 --- a/editeng/source/outliner/outleeng.hxx +++ b/editeng/source/outliner/outleeng.hxx @@ -68,7 +68,7 @@ public: virtual void DrawingTab( const Point& rStartPos, long nWidth, const String& rChar, - const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft, + const SvxFont& rFont, sal_uInt16 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft, bool bEndOfLine, bool bEndOfParagraph, const Color& rOverlineColor, diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 67988ba596..3e0cc204fc 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -922,7 +922,7 @@ Font Outliner::ImpCalcBulletFont( sal_uInt16 nPara ) const } // Use original scale... - USHORT nStretchX, nStretchY; + sal_uInt16 nStretchX, nStretchY; const_cast<Outliner*>(this)->GetGlobalCharStretching(nStretchX, nStretchY); sal_uInt16 nScale = pFmt->GetBulletRelSize() * nStretchY / 100; @@ -1144,7 +1144,7 @@ void Outliner::InvalidateBullet( Paragraph* /*pPara*/, sal_uLong nPara ) for ( size_t i = 0, n = aViewList.size(); i < n; ++i ) { OutlinerView* pView = aViewList[ i ]; - Point aPos( pView->pEditView->GetWindowPosTopLeft((USHORT)nPara ) ); + Point aPos( pView->pEditView->GetWindowPosTopLeft((sal_uInt16)nPara ) ); Rectangle aRect( pView->GetOutputArea() ); aRect.Right() = aPos.X(); aRect.Top() = aPos.Y(); @@ -1815,7 +1815,7 @@ void Outliner::DrawingText( const Point& rStartPos, const XubString& rText, sal_ } void Outliner::DrawingTab( const Point& rStartPos, long nWidth, const String& rChar, const SvxFont& rFont, - USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft, bool bEndOfLine, bool bEndOfParagraph, + sal_uInt16 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft, bool bEndOfLine, bool bEndOfParagraph, const Color& rOverlineColor, const Color& rTextLineColor) { if(aDrawPortionHdl.IsSet()) diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 217888fc06..7e832b7304 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -269,11 +269,8 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin ) } } -<<<<<<< HEAD - return bKeyProcessed ? TRUE : pEditView->PostKeyEvent( rKEvt, pFrameWin ); -======= - return bKeyProcessed ? sal_True : pEditView->PostKeyEvent( rKEvt ); ->>>>>>> ooo/DEV300_m101 + return bKeyProcessed ? sal_True : pEditView->PostKeyEvent( rKEvt, pFrameWin ); + } @@ -321,11 +318,7 @@ sal_uLong OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTa return nPara; } -<<<<<<< HEAD -BOOL OutlinerView::MouseMove( const MouseEvent& rMEvt ) -======= -sal_Bool __EXPORT OutlinerView::MouseMove( const MouseEvent& rMEvt ) ->>>>>>> ooo/DEV300_m101 +sal_Bool OutlinerView::MouseMove( const MouseEvent& rMEvt ) { DBG_CHKTHIS(OutlinerView,0); @@ -342,11 +335,7 @@ sal_Bool __EXPORT OutlinerView::MouseMove( const MouseEvent& rMEvt ) } -<<<<<<< HEAD -BOOL OutlinerView::MouseButtonDown( const MouseEvent& rMEvt ) -======= -sal_Bool __EXPORT OutlinerView::MouseButtonDown( const MouseEvent& rMEvt ) ->>>>>>> ooo/DEV300_m101 +sal_Bool OutlinerView::MouseButtonDown( const MouseEvent& rMEvt ) { DBG_CHKTHIS(OutlinerView,0); if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) || pEditView->GetEditEngine()->IsInSelectionMode() ) @@ -370,13 +359,8 @@ sal_Bool __EXPORT OutlinerView::MouseButtonDown( const MouseEvent& rMEvt ) sal_uLong nEndPara = nPara; if ( bHasChilds && pOwner->pParaList->HasVisibleChilds(pPara) ) nEndPara += pOwner->pParaList->GetChildCount( pPara ); -<<<<<<< HEAD - // The selection is inverted, so that EditEngine does not scroll - ESelection aSel((USHORT)nEndPara, 0xffff,(USHORT)nPara, 0 ); -======= - // umgekehrt rum selektieren, damit EditEngine nicht scrollt + // The selection is inverted, so that EditEngine does not scroll ESelection aSel((sal_uInt16)nEndPara, 0xffff,(sal_uInt16)nPara, 0 ); ->>>>>>> ooo/DEV300_m101 pEditView->SetSelection( aSel ); } else if( rMEvt.GetClicks() == 2 && bHasChilds ) @@ -402,11 +386,7 @@ sal_Bool __EXPORT OutlinerView::MouseButtonDown( const MouseEvent& rMEvt ) } -<<<<<<< HEAD -BOOL OutlinerView::MouseButtonUp( const MouseEvent& rMEvt ) -======= -sal_Bool __EXPORT OutlinerView::MouseButtonUp( const MouseEvent& rMEvt ) ->>>>>>> ooo/DEV300_m101 +sal_Bool OutlinerView::MouseButtonUp( const MouseEvent& rMEvt ) { DBG_CHKTHIS(OutlinerView,0); if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) || pEditView->GetEditEngine()->IsInSelectionMode() ) @@ -570,21 +550,11 @@ void OutlinerView::SetAttribs( const SfxItemSet& rAttrs ) pEditView->SetAttribs( rAttrs ); -<<<<<<< HEAD // Update Bullet text - for( USHORT nPara= aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ ) - { - pOwner->ImplCheckNumBulletItem( nPara ); - // update following paras as well, numbering depends on - // previous paras - pOwner->ImplCalcBulletText( nPara, TRUE, FALSE ); -======= - // Bullet-Texte aktualisieren for( sal_uInt16 nPara= aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ ) { pOwner->ImplCheckNumBulletItem( nPara ); pOwner->ImplCalcBulletText( nPara, sal_False, sal_False ); ->>>>>>> ooo/DEV300_m101 if( !pOwner->IsInUndo() && pOwner->IsUndoEnabled() ) pOwner->InsertUndo( new OutlinerUndoCheckPara( pOwner, nPara ) ); @@ -739,19 +709,8 @@ void OutlinerView::Indent( short nDiff ) } } -<<<<<<< HEAD - USHORT nParas = (USHORT)pOwner->pParaList->GetParagraphCount(); - for ( USHORT n = aSel.nEndPara+1; n < nParas; n++ ) -======= - // MT 19.08.99: War mal fuer Optimierung (outliner.cxx#1.193), - // hat aber zu zuviel Wartungsaufwand / doppelten Funktionen gefuehrt - // und zu wenig gebracht: - // pOwner->ImpSetBulletTextsFrom( aSel.nStartPara+1, nMinDepth ); - // Wird jetzt direkt in Schleife mit ImplCalcBulletText() erledigt. - // Jetzt fehlen nur noch die folgenden Ansaetze, die davon betroffen sind. sal_uInt16 nParas = (sal_uInt16)pOwner->pParaList->GetParagraphCount(); for ( sal_uInt16 n = aSel.nEndPara+1; n < nParas; n++ ) ->>>>>>> ooo/DEV300_m101 { Paragraph* pPara = pOwner->pParaList->GetParagraph( n ); if ( pPara->GetDepth() < nMinDepth ) @@ -1194,13 +1153,8 @@ sal_uInt16 OutlinerView::ImpCalcSelectedPages( sal_Bool bIncludeFirstSelected ) sal_uInt16 nFirstPage = 0xFFFF; sal_uInt16 nStartPara = aSel.nStartPara; if ( !bIncludeFirstSelected ) -<<<<<<< HEAD nStartPara++; // All paragraphs after StartPara will be deleted - for ( USHORT nPara = nStartPara; nPara <= aSel.nEndPara; nPara++ ) -======= - nStartPara++; // alle nach StartPara kommenden Absaetze werden geloescht for ( sal_uInt16 nPara = nStartPara; nPara <= aSel.nEndPara; nPara++ ) ->>>>>>> ooo/DEV300_m101 { Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara ); DBG_ASSERT(pPara, "ImpCalcSelectedPages: invalid Selection? "); @@ -1262,14 +1216,8 @@ void OutlinerView::ToggleBullets() // #i100014# // It is not a good idea to substract 1 from a count and cast the result -<<<<<<< HEAD - // to USHORT without check, if the count is 0. - USHORT nParaCount = (USHORT) (pOwner->pParaList->GetParagraphCount()); -======= // to sal_uInt16 without check, if the count is 0. sal_uInt16 nParaCount = (sal_uInt16) (pOwner->pParaList->GetParagraphCount()); - // <-- ->>>>>>> ooo/DEV300_m101 pOwner->ImplCheckParagraphs( aSel.nStartPara, nParaCount ); pOwner->pEditEngine->QuickMarkInvalid( ESelection( aSel.nStartPara, 0, nParaCount, 0 ) ); @@ -1301,14 +1249,9 @@ void OutlinerView::EnableBullets() // #i100014# // It is not a good idea to substract 1 from a count and cast the result -<<<<<<< HEAD - // to USHORT without check, if the count is 0. - USHORT nParaCount = (USHORT) (pOwner->pParaList->GetParagraphCount()); -======= // to sal_uInt16 without check, if the count is 0. sal_uInt16 nParaCount = (sal_uInt16) (pOwner->pParaList->GetParagraphCount()); - // <-- ->>>>>>> ooo/DEV300_m101 + pOwner->ImplCheckParagraphs( aSel.nStartPara, nParaCount ); pOwner->pEditEngine->QuickMarkInvalid( ESelection( aSel.nStartPara, 0, nParaCount, 0 ) ); diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx index 8e35263d83..c646710c4d 100644 --- a/editeng/source/outliner/paralist.cxx +++ b/editeng/source/outliner/paralist.cxx @@ -139,14 +139,14 @@ void ParagraphList::Append( Paragraph* pPara) maEntries.push_back(pPara); } -void ParagraphList::Insert( Paragraph* pPara, ULONG nAbsPos) +void ParagraphList::Insert( Paragraph* pPara, sal_uLong nAbsPos) { OSL_ASSERT(nAbsPos != ULONG_MAX && nAbsPos <= maEntries.size()); maEntries.insert(maEntries.begin()+nAbsPos,pPara); } -void ParagraphList::Remove( ULONG nPara ) +void ParagraphList::Remove( sal_uLong nPara ) { OSL_ASSERT(nPara < maEntries.size()); diff --git a/editeng/source/outliner/paralist.hxx b/editeng/source/outliner/paralist.hxx index 8fa8db965d..f95ee37fd4 100644 --- a/editeng/source/outliner/paralist.hxx +++ b/editeng/source/outliner/paralist.hxx @@ -45,7 +45,7 @@ public: return maEntries.size(); } - Paragraph* GetParagraph( ULONG nPos ) const + Paragraph* GetParagraph( sal_uLong nPos ) const { return nPos < maEntries.size() ? maEntries[nPos] : NULL; } @@ -54,9 +54,9 @@ public: sal_uLong GetVisPos( Paragraph* pParagraph ) const; void Append( Paragraph *pPara); - void Insert( Paragraph* pPara, ULONG nAbsPos); - void Remove( ULONG nPara ); - void MoveParagraphs( ULONG nStart, ULONG nDest, ULONG nCount ); + void Insert( Paragraph* pPara, sal_uLong nAbsPos); + void Remove( sal_uLong nPara ); + void MoveParagraphs( sal_uLong nStart, sal_uLong nDest, sal_uLong nCount ); Paragraph* NextVisible( Paragraph* ) const; Paragraph* PrevVisible( Paragraph* ) const; diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 3736c16f10..64a36aa426 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -217,15 +217,9 @@ void SvxRTFParser::SetScriptAttr( RTF_CharTypeDef eType, SfxItemSet& rSet, void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) { -<<<<<<< HEAD DBG_ASSERT( pSet, "A SfxItemSet has to be provided as argument!" ); - int bFirstToken = TRUE, bWeiter = TRUE; - USHORT nStyleNo = 0; // default -======= - DBG_ASSERT( pSet, "Es muss ein SfxItemSet uebergeben werden!" ); int bFirstToken = sal_True, bWeiter = sal_True; sal_uInt16 nStyleNo = 0; // default ->>>>>>> ooo/DEV300_m101 FontUnderline eUnderline; FontUnderline eOverline; FontEmphasisMark eEmphasis; @@ -307,53 +301,15 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) } else { -<<<<<<< HEAD - nStyleNo = -1 == nTokenValue ? 0 : USHORT(nTokenValue); - // Set the StyleNumber for the current style on - // the attribute stack - SvxRTFItemStackType* pAkt = aAttrStack.Top(); -======= nStyleNo = -1 == nTokenValue ? 0 : sal_uInt16(nTokenValue); // setze am akt. auf dem AttrStack stehenden Style die // StyleNummer SvxRTFItemStackType* pAkt = aAttrStack.empty() ? 0 : aAttrStack.back(); ->>>>>>> ooo/DEV300_m101 if( !pAkt ) break; pAkt->nStyleNo = sal_uInt16( nStyleNo ); -<<<<<<< HEAD -======= -#if 0 -// JP 05.09.95: zuruecksetzen der Style-Attribute fuehrt nur zu Problemen. -// Es muss reichen, wenn das ueber pard/plain erfolgt -// ansonsten Bugdoc 15304.rtf - nach nur "\pard" falscher Font !! - - SvxRTFStyleType* pStyle = aStyleTbl.Get( pAkt->nStyleNo ); - if( pStyle && pStyle->aAttrSet.Count() ) - { - //JP 07.07.95: - // alle Attribute, die in der Vorlage gesetzt werden - // auf defaults setzen. In RTF werden die Attribute - // der Vorlage danach ja wiederholt. - // WICHTIG: Attribute die in der Vorlage definiert - // sind, werden zurueckgesetzt !!!! - // pAkt->aAttrSet.Put( pStyle->aAttrSet ); - - SfxItemIter aIter( pStyle->aAttrSet ); - SfxItemPool* pPool = pStyle->aAttrSet.GetPool(); - sal_uInt16 nWh = aIter.GetCurItem()->Which(); - while( sal_True ) - { - pAkt->aAttrSet.Put( pPool->GetDefaultItem( nWh )); - if( aIter.IsAtEnd() ) - break; - nWh = aIter.NextItem()->Which(); - } - } -#endif ->>>>>>> ooo/DEV300_m101 } break; @@ -505,13 +461,8 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) nTokenValue = short( 100L * aLSpace.GetLineHeight() / long( nTokenValue ) ); -<<<<<<< HEAD if( nTokenValue > 200 ) // Data value for PropLnSp nTokenValue = 200; // is one BYTE !!! -======= - if( nTokenValue > 200 ) // Datenwert fuer PropLnSp - nTokenValue = 200; // ist ein sal_uInt8 !!! ->>>>>>> ooo/DEV300_m101 aLSpace.SetPropLineSpace( (const sal_uInt8)nTokenValue ); aLSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO; @@ -1011,9 +962,7 @@ ATTR_SETOVERLINE: break; //#i12501# While cb is clearly documented in the rtf spec, word //doesn't accept it at all -<<<<<<< HEAD - -======= +#if 0 case RTF_CB: if( PLAINID->nBgColor ) { @@ -1022,7 +971,7 @@ ATTR_SETOVERLINE: } break; #endif ->>>>>>> ooo/DEV300_m101 + case RTF_LANG: if( PLAINID->nLanguage ) { @@ -1187,13 +1136,8 @@ ATTR_SETEMPHASIS: case RTF_SWG_ESCPROP: { -<<<<<<< HEAD // Store percentage change! - BYTE nProp = BYTE( nTokenValue / 100 ); -======= - // prozentuale Veraenderung speichern ! sal_uInt8 nProp = sal_uInt8( nTokenValue / 100 ); ->>>>>>> ooo/DEV300_m101 short nEsc = 0; if( 1 == ( nTokenValue % 100 )) // Recognize own auto-flags! @@ -1250,10 +1194,6 @@ ATTR_SETEMPHASIS: if( RTF_SHDW_FCOL != GetNextToken() ) break; -<<<<<<< HEAD -======= -// sal_uInt16 nFillCol = sal_uInt16( nTokenValue ); ->>>>>>> ooo/DEV300_m101 Color aColor = GetColor( nCol ); @@ -1351,35 +1291,6 @@ ATTR_SETEMPHASIS: } bFirstToken = sal_False; } -<<<<<<< HEAD -======= - -/* - // teste Attribute gegen ihre Styles - if( IsChkStyleAttr() && pSet->Count() && !pInsPos->GetCntIdx() ) - { - SvxRTFStyleType* pStyle = aStyleTbl.Get( nStyleNo ); - if( pStyle && pStyle->aAttrSet.Count() ) - { - // alle Attribute, die schon vom Style definiert sind, aus dem - // akt. Set entfernen - const SfxPoolItem* pItem; - SfxItemIter aIter( *pSet ); - sal_uInt16 nWhich = aIter.GetCurItem()->Which(); - while( sal_True ) - { - if( SFX_ITEM_SET == pStyle->aAttrSet.GetItemState( - nWhich, sal_False, &pItem ) && *pItem == *aIter.GetCurItem()) - pSet->ClearItem( nWhich ); // loeschen - - if( aIter.IsAtEnd() ) - break; - nWhich = aIter.NextItem()->Which(); - } - } - } -*/ ->>>>>>> ooo/DEV300_m101 } void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet ) @@ -1432,27 +1343,16 @@ void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet ) nSkip = -2; else { -<<<<<<< HEAD - aTabStop.GetDecimal() = BYTE(nTokenValue & 0xff); - aTabStop.GetFill() = BYTE((nTokenValue >> 8) & 0xff); - // overwrite the closing parenthesis -======= aTabStop.GetDecimal() = sal_uInt8(nTokenValue & 0xff); aTabStop.GetFill() = sal_uInt8((nTokenValue >> 8) & 0xff); - // ueberlese noch die schliessende Klammer ->>>>>>> ooo/DEV300_m101 + // overwrite the closing parenthesis if (bMethodOwnsToken) GetNextToken(); } if( nSkip ) { -<<<<<<< HEAD SkipToken( nSkip ); // Ignore back again - bWeiter = FALSE; -======= - SkipToken( nSkip ); // Ignore wieder zurueck bWeiter = sal_False; ->>>>>>> ooo/DEV300_m101 } } break; @@ -1510,13 +1410,8 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet, if( SFX_ITEM_SET == rSet.GetItemState( PARDID->nBox, sal_False, &pItem ) ) aAttr = *(SvxBoxItem*)pItem; -<<<<<<< HEAD SvxBorderLine aBrd( 0, DEF_LINE_WIDTH_0, 0, 0 ); // simple lines - int bWeiter = TRUE, nBorderTyp = 0; -======= - SvxBorderLine aBrd( 0, DEF_LINE_WIDTH_0, 0, 0 ); // einfache Linien int bWeiter = sal_True, nBorderTyp = 0; ->>>>>>> ooo/DEV300_m101 do { switch( nToken ) @@ -1765,13 +1660,8 @@ SETBORDERLINE: if( nSkip ) { -<<<<<<< HEAD SkipToken( nSkip ); // Ignore back again - bWeiter = FALSE; -======= - SkipToken( nSkip ); // Ignore wieder zurueck bWeiter = sal_False; ->>>>>>> ooo/DEV300_m101 } } break; @@ -1796,17 +1686,10 @@ inline sal_uInt32 CalcShading( sal_uInt32 nColor, sal_uInt32 nFillColor, sal_uIn void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet, int bTableDef ) { -<<<<<<< HEAD // then read the border attribute - int bWeiter = TRUE; - USHORT nColor = USHRT_MAX, nFillColor = USHRT_MAX; - BYTE nFillValue = 0; -======= - // dann lese doch mal das BoderAttribut ein int bWeiter = sal_True; sal_uInt16 nColor = USHRT_MAX, nFillColor = USHRT_MAX; sal_uInt8 nFillValue = 0; ->>>>>>> ooo/DEV300_m101 sal_uInt16 nWh = ( nToken & ~0xff ) == RTF_CHRFMT ? PLAINID->nBgColor @@ -1929,11 +1812,7 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet, // pard / plain abarbeiten void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet ) { -<<<<<<< HEAD - if( !bNewGroup && aAttrStack.Top() ) // not at the beginning of a new group -======= if( !bNewGroup && !aAttrStack.empty() ) // not at the beginning of a new group ->>>>>>> ooo/DEV300_m101 { SvxRTFItemStackType* pAkt = aAttrStack.back(); @@ -1945,13 +1824,8 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet ) { if( pAkt->aAttrSet.Count() || pAkt->pChildList || pAkt->nStyleNo ) { -<<<<<<< HEAD // open a new group - SvxRTFItemStackType* pNew = new SvxRTFItemStackType( *pAkt, *pInsPos, TRUE ); -======= - // eine neue Gruppe aufmachen SvxRTFItemStackType* pNew = new SvxRTFItemStackType( *pAkt, *pInsPos, sal_True ); ->>>>>>> ooo/DEV300_m101 pNew->SetRTFDefaults( GetRTFDefaults() ); // Set all until here valid attributes @@ -2079,13 +1953,8 @@ void SvxRTFParser::SetDefault( int nToken, int nValue ) case RTF_DEFTAB: if( PARDID->nTabStop ) { -<<<<<<< HEAD // RTF defines 720 twips as default - bIsSetDfltTab = TRUE; -======= - // RTF definiert 720 twips als default bIsSetDfltTab = sal_True; ->>>>>>> ooo/DEV300_m101 if( -1 == nValue || !nValue ) nValue = 720; @@ -2096,44 +1965,11 @@ void SvxRTFParser::SetDefault( int nToken, int nValue ) CalcValue(); nValue = nTokenValue; } -<<<<<<< HEAD // Calculate the ratio of default TabWidth / Tabs and // calculate the corresponding new number. // ?? how did one come up with 13 ?? - USHORT nAnzTabs = (SVX_TAB_DEFDIST * 13 ) / USHORT(nValue); -======= -#if 1 - /* - cmc: - This stuff looks a little hairy indeed, this should be totally - unnecessary where default tabstops are understood. Just make one - tabstop and stick the value in there, the first one is all that - matters. - - e.g. - - SvxTabStopItem aNewTab(1, sal_uInt16(nValue), SVX_TAB_ADJUST_DEFAULT, - PARDID->nTabStop); - ((SvxTabStop&)aNewTab[0]).GetAdjustment() = SVX_TAB_ADJUST_DEFAULT; - - - It must exist as a foul hack to support somebody that does not - have a true concept of default tabstops by making a tabsetting - result from the default tabstop, creating a lot of them all at - the default locations to give the effect of the first real - default tabstop being in use just in case the receiving - application doesn't do that for itself. - */ -#endif - - // Verhaeltnis der def. TabWidth / Tabs errechnen und - // enstsprechend die neue Anzahl errechnen. -/*-----------------14.12.94 19:32------------------- - ?? wie kommt man auf die 13 ?? ---------------------------------------------------*/ sal_uInt16 nAnzTabs = (SVX_TAB_DEFDIST * 13 ) / sal_uInt16(nValue); ->>>>>>> ooo/DEV300_m101 /* cmc, make sure we have at least one, or all hell breaks loose in everybodies exporters, #i8247# @@ -2141,13 +1977,8 @@ void SvxRTFParser::SetDefault( int nToken, int nValue ) if (nAnzTabs < 1) nAnzTabs = 1; -<<<<<<< HEAD // we want Defaulttabs - SvxTabStopItem aNewTab( nAnzTabs, USHORT(nValue), -======= - // wir wollen Defaulttabs SvxTabStopItem aNewTab( nAnzTabs, sal_uInt16(nValue), ->>>>>>> ooo/DEV300_m101 SVX_TAB_ADJUST_DEFAULT, PARDID->nTabStop ); while( nAnzTabs ) ((SvxTabStop&)aNewTab[ --nAnzTabs ]).GetAdjustment() = SVX_TAB_ADJUST_DEFAULT; diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx index 8a560e8dd2..9bdad500c4 100755 --- a/fpicker/source/unx/gnome/SalGtkPicker.cxx +++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx @@ -228,46 +228,6 @@ static void lcl_setGTKLanguage(const uno::Reference<lang::XMultiServiceFactory>& static bool bSet = false; if (bSet) return; - - OUString sUILocale; - try - { - uno::Reference<lang::XMultiServiceFactory> xConfigMgr = - uno::Reference<lang::XMultiServiceFactory>(xServiceMgr->createInstance( - OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), - UNO_QUERY_THROW ); - - Sequence< Any > theArgs(1); - theArgs[ 0 ] <<= OUString::createFromAscii("org.openoffice.Office.Linguistic/General"); - - uno::Reference< container::XNameAccess > xNameAccess = - uno::Reference< container::XNameAccess >(xConfigMgr->createInstanceWithArguments( - OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"), theArgs ), - UNO_QUERY_THROW ); - - if (xNameAccess.is()) - xNameAccess->getByName(OUString::createFromAscii("UILocale")) >>= sUILocale; - } catch (...) {} - - if (sUILocale.getLength()) - { - sUILocale = sUILocale.replace('-', '_'); - rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("LANGUAGE")); - osl_setEnvironment(envVar.pData, sUILocale.pData); - } - bSet = true; -} - -SalGtkPicker::SalGtkPicker(const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr) : m_pDialog(0) -{ - lcl_setGTKLanguage(xServiceMgr); -} - -static void lcl_setGTKLanguage(const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr) -{ - static bool bSet = false; - if (bSet) - return; OUString sUILocale; try diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 5d30d108cd..1c9271192f 100755 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -54,7 +54,6 @@ $(eval $(call gb_Library_add_linked_libs,fwe,\ tl \ utl \ vcl \ - vos3 \ $(gb_STDLIBS) \ )) diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index 046c7230e3..1d4bb80b62 100755 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -57,7 +57,6 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\ tl \ utl \ vcl \ - vos3 \ $(gb_STDLIBS) \ )) diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index dbd486c40d..a0d53102ab 100755 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -52,7 +52,6 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\ tl \ utl \ vcl \ - vos3 \ $(gb_STDLIBS) \ )) diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index e1f07c7440..a855e04d86 100755 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -48,7 +48,6 @@ // other includes #include <comphelper/mediadescriptor.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> #include <toolkit/unohlp.hxx> // namespace @@ -132,7 +131,7 @@ ToolBox* getToolboxPtr( Window* pWindow ) Window* getWindowFromXUIElement( const uno::Reference< ui::XUIElement >& xUIElement ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; uno::Reference< awt::XWindow > xWindow; if ( xUIElement.is() ) xWindow = uno::Reference< awt::XWindow >( xUIElement->getRealInterface(), uno::UNO_QUERY ); @@ -169,7 +168,7 @@ bool lcl_checkUIElement(const uno::Reference< ui::XUIElement >& xUIElement, awt: bool bRet = xUIElement.is(); if ( bRet ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; _xWindow.set( xUIElement->getRealInterface(), uno::UNO_QUERY ); _rPosSize = _xWindow->getPosSize(); @@ -341,7 +340,7 @@ sal_Bool implts_isFrameOrWindowTop( const uno::Reference< frame::XFrame >& xFram if (xWindowCheck.is()) { // --> PB 2007-06-18 #i76867# top and system window is required. - ::vos::OGuard aSolarLock(&Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< awt::XWindow > xWindow( xWindowCheck, uno::UNO_QUERY ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); return ( pWindow && pWindow->IsSystemWindow() ); diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 700a65f189..c198beabeb 100755 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -1417,7 +1417,7 @@ void LayoutManager::implts_reparentChildWindows() if ( xStatusBarWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); Window* pWindow = VCLUnoHelper::GetWindow( xStatusBarWindow ); if ( pWindow && pContainerWindow ) @@ -1504,8 +1504,8 @@ throw (RuntimeException) m_xMenuBar = implts_createElement( aName ); if ( m_xMenuBar.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); - + SolarMutexGuard aGuard; + SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow ); if ( pSysWindow ) { @@ -1892,8 +1892,8 @@ throw (RuntimeException) if ( m_xContainerWindow.is() ) { m_bMenuVisible = sal_False; - - vos::OGuard aGuard( Application::GetSolarMutex() ); + + SolarMutexGuard aGuard; SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow ); if ( pSysWindow ) { @@ -3259,4 +3259,4 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL LayoutManager::getPropertySet } // namespace framework -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/layoutmanager/panel.cxx b/framework/source/layoutmanager/panel.cxx index 1e208e1f8c..2ddbaeb826 100755 --- a/framework/source/layoutmanager/panel.cxx +++ b/framework/source/layoutmanager/panel.cxx @@ -42,7 +42,6 @@ // other includes //_________________________________________________________________________________________________________________ -#include <vos/mutex.hxx> #include <vcl/svapp.hxx> #include <toolkit/unohlp.hxx> @@ -63,8 +62,8 @@ Panel::Panel( { uno::Reference< awt::XWindowPeer > xWindowPeer( rParent, uno::UNO_QUERY ); m_xPanelWindow = uno::Reference< awt::XWindow >( createToolkitWindow( rSMGR, xWindowPeer, "splitwindow" ), uno::UNO_QUERY ); - - vos::OGuard aGuard( Application::GetSolarMutex() ); + + SolarMutexGuard aGuard; SplitWindow* pSplitWindow = dynamic_cast< SplitWindow* >( VCLUnoHelper::GetWindow( m_xPanelWindow )); if ( pSplitWindow ) @@ -84,5 +83,5 @@ Panel::Panel( Panel::~Panel() { } - + } // namespace framework diff --git a/framework/source/layoutmanager/panelmanager.cxx b/framework/source/layoutmanager/panelmanager.cxx index 81428a62de..978edac361 100755 --- a/framework/source/layoutmanager/panelmanager.cxx +++ b/framework/source/layoutmanager/panelmanager.cxx @@ -92,7 +92,7 @@ bool PanelManager::createPanels() { if ( m_xFrame.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; uno::Reference< awt::XWindow > xWindow( m_xFrame->getContainerWindow(), uno::UNO_QUERY ); if ( xWindow.is() ) { diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 5f48a31393..8d4f643804 100755 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -302,7 +302,7 @@ Rectangle ToolbarLayoutManager::implts_calcDockingArea() uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY ); if ( xWindow.is() && xDockWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && !xDockWindow->isFloating() && pConstIter->m_bVisible ) @@ -556,7 +556,7 @@ bool ToolbarLayoutManager::showToolbar( const ::rtl::OUString& rResourceURL ) { UIElement aUIElement = implts_findToolbar( rResourceURL ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = getWindowFromXUIElement( aUIElement.m_xUIElement ); if ( pWindow ) { @@ -578,7 +578,7 @@ bool ToolbarLayoutManager::hideToolbar( const ::rtl::OUString& rResourceURL ) { UIElement aUIElement = implts_findToolbar( rResourceURL ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = getWindowFromXUIElement( aUIElement.m_xUIElement ); if ( pWindow ) { @@ -609,7 +609,7 @@ void ToolbarLayoutManager::refreshToolbarsVisibility( bool bAutomaticToolbars ) implts_getUIElementVectorCopy( aUIElementVector ); UIElement aUIElement; - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; UIElementVector::iterator pIter; for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ ) { @@ -632,7 +632,7 @@ void ToolbarLayoutManager::setFloatingToolbarsVisibility( bool bVisible ) UIElementVector aUIElementVector; implts_getUIElementVectorCopy( aUIElementVector ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; UIElementVector::iterator pIter; for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ ) { @@ -655,7 +655,7 @@ void ToolbarLayoutManager::setVisible( bool bVisible ) UIElementVector aUIElementVector; implts_getUIElementVectorCopy( aUIElementVector ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; UIElementVector::iterator pIter; for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ ) { @@ -704,7 +704,7 @@ bool ToolbarLayoutManager::dockToolbar( const ::rtl::OUString& rResourceURL, ui: ToolBox* pToolBox( 0 ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { @@ -722,7 +722,7 @@ bool ToolbarLayoutManager::dockToolbar( const ::rtl::OUString& rResourceURL, ui: // we have to find a good place for it. ::Size aSize; - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; { if ( pToolBox ) aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( aUIElement.m_aDockedData.m_nDockedArea ) ); @@ -906,7 +906,7 @@ void ToolbarLayoutManager::setParentWindow( if ( xParentWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; ::DockingAreaWindow* pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xTopDockWindow ) ); if( pWindow ) pWindow->SetAlign( WINDOWALIGN_TOP ); pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xBottomDockWindow ) ); @@ -1036,7 +1036,7 @@ void ToolbarLayoutManager::implts_createAddonsToolBars() if ( xWindow.is() ) { // Set generic title for add-on toolbar - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow->GetText().Len() == 0 ) pWindow->SetText( aGenericAddonTitle ); @@ -1185,7 +1185,7 @@ void ToolbarLayoutManager::implts_createCustomToolBar( const rtl::OUString& aTbx if ( aTitle && xUIElement.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = getWindowFromXUIElement( xUIElement ); if ( pWindow ) @@ -1205,7 +1205,7 @@ void ToolbarLayoutManager::implts_reparentToolbars() Window* pRightDockWindow = VCLUnoHelper::GetWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_RIGHT] ); aWriteLock.unlock(); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( pContainerWindow ) { UIElementVector::iterator pIter; @@ -1326,7 +1326,7 @@ void ToolbarLayoutManager::implts_createToolBar( const ::rtl::OUString& aName, b // set toolbar menu style according to customize command state SvtCommandOptions aCmdOptions; - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { @@ -1388,7 +1388,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno if ( xDockWindow.is() && xWindow.is() ) { { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) { @@ -1414,7 +1414,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno { if ( pWindow ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; String aText = pWindow->GetText(); if ( aText.Len() == 0 ) pWindow->SetText( rElement.m_aUIName ); @@ -1441,7 +1441,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno if( pToolBox ) { // set an optimal initial floating size - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; ::Size aSize( pToolBox->CalcFloatingWindowSizePixel() ); pToolBox->SetOutputSizePixel( aSize ); } @@ -1461,7 +1461,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno implts_writeWindowStateData( rElement ); if ( bShowElement && pWindow ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); } } @@ -1474,7 +1474,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno if ( pToolBox ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pToolBox->SetAlign( ImplConvertAlignment(rElement.m_aDockedData.m_nDockedArea ) ); pToolBox->SetLineCount( 1 ); xDockWindow->setFloatingMode( sal_False ); @@ -1495,8 +1495,8 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno xWindow->setOutputSize( AWTSize( aSize) ); if ( pWindow ) - { - vos::OGuard aGuard( Application::GetSolarMutex() ); + { + SolarMutexGuard aGuard; if ( !bShowElement ) pWindow->Hide(); } @@ -1914,7 +1914,7 @@ void ToolbarLayoutManager::implts_setToolbar( const UIElement& rUIElement ) Window* pContainerWindow( 0 ); if ( xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); if ( pContainerWindow ) aStartPos = pContainerWindow->OutputToScreenPixel( aStartPos ); @@ -1938,7 +1938,7 @@ void ToolbarLayoutManager::implts_setToolbar( const UIElement& rUIElement ) uno::Reference< awt::XWindow > xWindow( xDockWindow, uno::UNO_QUERY ); if ( xDockWindow.is() && xDockWindow->isFloating() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->IsVisible() ) { @@ -2209,7 +2209,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D uno::Reference< awt::XWindow > xWindow( xUIElement->getRealInterface(), uno::UNO_QUERY ); if ( xWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY ); if ( pWindow && pIter->m_bVisible && xDockWindow.is() && !pIter->m_bFloating ) @@ -2313,7 +2313,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D aReadLock.unlock(); // Calc correct position of the column/row rectangle to be able to compare it with mouse pos/tracking rect - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // Retrieve output size from container Window if ( pDockingAreaWindow && pContainerWindow ) @@ -2414,7 +2414,7 @@ void ToolbarLayoutManager::implts_findNextDockingPos( ui::DockingArea DockingAre { // Retrieve output size from container Window - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pDockingWindow = VCLUnoHelper::GetWindow( xDockingWindow ); if ( pDockingWindow ) aDockingWinSize = pDockingWindow->GetOutputSizePixel(); @@ -2629,7 +2629,7 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( awt::Rectangle& rWinRect = rRowColumnWindowData.aRowColumnWindowSizes[i]; ::Size aMinSize; - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; { uno::Reference< awt::XWindow > xWindow = rRowColumnWindowData.aRowColumnWindows[i]; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); @@ -2690,7 +2690,7 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nCurrPos( 0 ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; for ( sal_uInt32 i = 0; i < nCount; i++ ) { uno::Reference< awt::XWindow > xWindow = rRowColumnWindowData.aRowColumnWindows[i]; @@ -2765,7 +2765,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( { // Retrieve output size from container Window - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); aContainerWinSize = pContainerWindow->GetOutputSizePixel(); } @@ -2793,7 +2793,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( aReadLock.unlock(); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pDockingAreaWindow = VCLUnoHelper::GetWindow( xDockingAreaWindow ); pDockWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pDockWindow && pDockWindow->GetType() == WINDOW_TOOLBOX ) @@ -2845,7 +2845,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( { // Calc correct position of the column/row rectangle to be able to compare it with mouse pos/tracking rect - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; aRect.SetPos( pContainerWindow->ScreenToOutputPixel( pDockingAreaWindow->OutputToScreenPixel( aRect.TopLeft() ))); } @@ -2944,7 +2944,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( // Set virtual position sal_Int32 nPosY( 0 ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; nPosY = pDockingAreaWindow->ScreenToOutputPixel( pContainerWindow->OutputToScreenPixel( aWindowRect.BottomRight() )).Y(); } @@ -3068,7 +3068,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( rTrackingRect.setWidth( nSize ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; nPosX = pDockingAreaWindow->ScreenToOutputPixel( pContainerWindow->OutputToScreenPixel( rTrackingRect.TopLeft() )).X(); } @@ -3114,7 +3114,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( rTrackingRect.setHeight( nSize ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; nPosY = pDockingAreaWindow->ScreenToOutputPixel( pContainerWindow->OutputToScreenPixel( rTrackingRect.TopLeft() )).Y(); } @@ -3229,7 +3229,7 @@ framework::ToolbarLayoutManager::DockingOperation ToolbarLayoutManager::implts_d Window* pDockingAreaWindow( 0 ); Window* pContainerWindow( 0 ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pDockingAreaWindow = VCLUnoHelper::GetWindow( xDockingAreaWindow ); pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); nDockPosY = pDockingAreaWindow->ScreenToOutputPixel( pContainerWindow->OutputToScreenPixel( ::Point( 0, nPosY ))).Y(); @@ -3423,7 +3423,7 @@ throw (uno::RuntimeException) Window* pWindow( 0 ); ::Point aMousePos; { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); aMousePos = pContainerWindow->ScreenToOutputPixel( ::Point( e.MousePos.X, e.MousePos.Y )); } @@ -3444,7 +3444,8 @@ throw (uno::RuntimeException) aUIElement.m_aFloatingData.m_aPos = ::Point( aPos.X, aPos.Y ); aUIElement.m_aFloatingData.m_aSize = ::Size( aSize.Width, aSize.Height ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; + pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { @@ -3490,7 +3491,7 @@ throw (uno::RuntimeException) { try { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; sal_Int16 eDockingArea( -1 ); // none sal_Int32 nMagneticZone( aUIDockingElement.m_bFloating ? MAGNETIC_DISTANCE_DOCK : MAGNETIC_DISTANCE_UNDOCK ); @@ -3693,7 +3694,7 @@ throw (uno::RuntimeException) if ( bDockingInProgress ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( uno::Reference< awt::XWindow >( e.Source, uno::UNO_QUERY )); ToolBox* pToolBox = 0; if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) @@ -3755,7 +3756,7 @@ throw (uno::RuntimeException) if ( xDockWindow->isFloating() ) { { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { @@ -3793,7 +3794,7 @@ throw (uno::RuntimeException) uno::Reference< awt::XWindow2 > xWindow; { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; xWindow = uno::Reference< awt::XWindow2 >( e.Source, uno::UNO_QUERY ); pWindow = VCLUnoHelper::GetWindow( xWindow ); @@ -3814,7 +3815,7 @@ throw (uno::RuntimeException) implts_setLayoutInProgress( true ); if ( aUIDockingElement.m_bFloating ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( pToolBox ) { pToolBox->SetLineCount( aUIDockingElement.m_aFloatingData.m_nLines ); @@ -3854,7 +3855,7 @@ throw (uno::RuntimeException) ::Size aSize; { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( pToolBox ) aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea ) ); else @@ -3865,7 +3866,7 @@ throw (uno::RuntimeException) aUIDockingElement.m_aDockedData.m_aPos = aDockPos; } - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( pToolBox ) { pToolBox->SetAlign( ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea) ); @@ -3892,7 +3893,7 @@ throw (uno::RuntimeException) } else { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( pToolBox ) { if ( aUIDockingElement.m_bFloating ) @@ -4001,7 +4002,7 @@ throw (uno::RuntimeException) catch ( lang::WrappedTargetException& ) {} { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = getWindowFromXUIElement( xUIElement ); if ( pWindow ) pWindow->SetText( aUIName ); @@ -4226,7 +4227,7 @@ awt::Size ToolbarLayoutManager::getToolbarSize( const ::rtl::OUString& rResource { Window* pWindow = implts_getWindow( rResourceURL ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( pWindow ) { ::Size aSize = pWindow->GetSizePixel(); diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index ff7eb738ca..b707587057 100755 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -142,7 +142,7 @@ static sal_Bool IsCorrectContext( const ::rtl::OUString& rModuleIdentifier, cons static Image RetrieveImage( Reference< com::sun::star::frame::XFrame >& rFrame, const rtl::OUString& aImageId, const rtl::OUString& aURL, - BOOL bBigImage + sal_Bool bBigImage ) { Image aImage; diff --git a/framework/source/uielement/panelwrapper.cxx b/framework/source/uielement/panelwrapper.cxx index b20e927c18..e26a01f801 100755 --- a/framework/source/uielement/panelwrapper.cxx +++ b/framework/source/uielement/panelwrapper.cxx @@ -100,7 +100,7 @@ void SAL_CALL PanelWrapper::dispose() throw ( RuntimeException ) ModelWinService* pService = dynamic_cast< ModelWinService* >( xNameAccess.get() ); if ( pService != 0 ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; PanelWindow* pPanelWindow = dynamic_cast< PanelWindow* >( m_xPanelWindow.get() ); if ( pPanelWindow != NULL ) { @@ -147,7 +147,7 @@ void SAL_CALL PanelWrapper::initialize( const Sequence< Any >& aArguments ) thro PanelWindow* pPanelWindow(0); Window* pContentWindow(0); { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); pContentWindow = VCLUnoHelper::GetWindow( xContentWindow ); if ( pWindow ) diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 2344d79746..f31c8fb394 100755 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -72,9 +72,7 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\ ucbhelper \ utl \ vcl \ - vos3 \ xml2 \ - eggtray \ sfx \ )) diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index c18b46c8f1..0e58d301a0 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -74,7 +74,6 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ ucbhelper \ utl \ vcl \ - vos3 \ xml2 \ $(gb_STDLIBS) \ )) diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index b88e2581f2..e5c738ac87 100755 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -34,14 +34,14 @@ $(eval $(call gb_Module_add_targets,sfx2,\ Package_sdi \ )) -$(eval $(call gb_Module_add_check_targets,sfx2,\ - CppunitTest_sfx2_metadatable \ -)) +#$(eval $(call gb_Module_add_check_targets,sfx2,\ +# CppunitTest_sfx2_metadatable \ +#)) -$(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\ - JunitTest_sfx2_complex \ - JunitTest_sfx2_unoapi \ -)) +#$(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\ +# JunitTest_sfx2_complex \ +# JunitTest_sfx2_unoapi \ +#)) ifeq ($(OS),LINUX) ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index b414774d0b..f7b3101154 100755 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -1626,7 +1626,7 @@ public: i_rModel.MethodEntryCheck( i_eState != E_INITIALIZING ); } SfxModelGuard( SfxModelSubComponent& i_rSubComponent ) - :m_aGuard( Application::GetSolarMutex() ) + :m_aGuard() { i_rSubComponent.MethodEntryCheck(); } @@ -1645,7 +1645,7 @@ public: } private: - SolarMutexClearableGuard m_aGuard; + SolarMutexResettableGuard m_aGuard; }; #undef css diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index 34bb1ef56d..049fabb214 100755 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -302,7 +302,7 @@ public: SAL_DLLPRIVATE bool GlobalKeyInput_Impl( const KeyEvent &rKeyEvent ); SAL_DLLPRIVATE void NewIPClient_Impl( SfxInPlaceClient *pIPClient ) - { GetIPClientList_Impl(TRUE)->push_back(pIPClient); } + { GetIPClientList_Impl(sal_True)->push_back(pIPClient); } SAL_DLLPRIVATE void IPClientGone_Impl( SfxInPlaceClient *pIPClient ); SAL_DLLPRIVATE SfxInPlaceClientList* GetIPClientList_Impl( sal_Bool bCreate = sal_True ) const; SAL_DLLPRIVATE void ResetAllClients_Impl( SfxInPlaceClient *pIP ); @@ -381,4 +381,4 @@ inline SfxViewFrame* SfxViewShell::GetViewFrame() const #endif // #ifndef _SFXVIEWSH_HXX -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index b99479c346..872a83997c 100755 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -941,7 +941,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) if (pObjSh) pObjSh->SetConfigOptionsChecked(false); } - pView->GetBindings().InvalidateAll(FALSE); + pView->GetBindings().InvalidateAll(sal_False); pView = SfxViewFrame::GetNext( *pView ); } } diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 2be075caf9..6e6033ba58 100755 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -2150,16 +2150,6 @@ SFX2_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } - - - // writer compatable document properties - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += comp_CompatWriterDocProps::_getImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.writer.DocumentProperties")) ); SFX2_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* pImplementationName , void* pServiceManager , diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx index d3ac6bc4ea..ee273ba890 100755 --- a/sfx2/source/appl/helpinterceptor.cxx +++ b/sfx2/source/appl/helpinterceptor.cxx @@ -136,7 +136,7 @@ void HelpInterceptor_Impl::SetStartURL( const String& rURL ) { m_pHistory = new HelpHistoryList_Impl; Any aEmptyViewData; - m_pHistory->insert( m_pHistory->begin(), new HelpHistoryEntry_Impl( rURL, aEmptyViewData, (sal_uIntPtr)0x0 ) ); + m_pHistory->insert( m_pHistory->begin(), new HelpHistoryEntry_Impl( rURL, aEmptyViewData)); m_nCurPos = m_pHistory->size() - 1; m_pWindow->UpdateToolbox(); @@ -169,7 +169,7 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch( if ( m_xSlaveDispatcher.is() ) xResult = m_xSlaveDispatcher->queryDispatch( aURL, aTargetFrameName, nSearchFlags ); - BOOL bHelpURL = aURL.Complete.toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0); + sal_Bool bHelpURL = aURL.Complete.toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0); if ( bHelpURL ) { diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index dfbf6e12b2..f67a15c192 100755 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -353,7 +353,7 @@ void LinkManager::UpdateAllLinks( int nRet = QueryBox( pParentWin, WB_YES_NO | WB_DEF_YES, SfxResId( STR_QUERY_UPDATE_LINKS ) ).Execute(); if( RET_YES != nRet ) return ; // nothing should be updated - bAskUpdate = sal_False // once is enough + bAskUpdate = sal_False; // once is enough } pLink->Update(); @@ -467,7 +467,7 @@ void LinkManager::LinkServerShell(const OUString& rPath, SfxObjectShell& rServer } } -bool LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink, +sal_Bool LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink, sal_uInt16 nFileType, const String& rFileNm, const String* pFilterNm, diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index e4472e4a52..3c6b5b1391 100755 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -338,7 +338,7 @@ ImageList* SfxModule::GetImageList_Impl( sal_Bool bBig ) return pImpl->GetImageList( pResMgr, bBig ); } -SfxTabPage* SfxModule::CreateTabPage( sal_uInt16 Window*, const SfxItemSet& ) +SfxTabPage* SfxModule::CreateTabPage( sal_uInt16, Window*, const SfxItemSet& ) { return NULL; } diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 02d56aac6e..68c44165ac 100755 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2640,8 +2640,8 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) aMenu.InsertItem( TBI_COPY, String( SfxResId( STR_HELP_MENU_TEXT_COPY ) ), Image( SfxResId( IMG_HELP_TOOLBOX_COPY ) ) + ); aMenu.SetHelpId( TBI_COPY, ".uno:Copy" ); - ); aMenu.EnableItem( TBI_COPY, HasSelection() ); if ( bIsDebug ) @@ -3083,7 +3083,7 @@ IMPL_LINK( SfxHelpWindow_Impl, OpenHdl, SfxHelpIndexWindow_Impl* , EMPTYARG ) ::rtl::OUString sHelpURL; - BOOL bComplete = rtl::OUString(aEntry).toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0); + bool bComplete = rtl::OUString(aEntry).toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0); if (bComplete) sHelpURL = ::rtl::OUString(aEntry); diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 395ad6263a..1edce235f9 100755 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -254,7 +254,6 @@ static Sequence< ::rtl::OUString > GetPropertyNames() SfxHelpOptions_Impl::SfxHelpOptions_Impl() : ConfigItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.SFX/Help")) ) - , m_pIds( NULL ) { Sequence< ::rtl::OUString > aNames = GetPropertyNames(); Sequence< Any > aValues = GetProperties( aNames ); @@ -705,7 +704,7 @@ XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow static bool impl_hasHelpInstalled( const rtl::OUString &rLang = rtl::OUString() ) { String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") ); - AppendConfigToken_Impl( aHelpRootURL, sal_True ); + AppendConfigToken( aHelpRootURL, sal_True ); Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL ); return ( aFactories.getLength() != 0 ); @@ -752,7 +751,7 @@ static bool impl_showOnlineHelp( const String& rURL ) sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword ) { String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") ); - AppendConfigToken( aHelpRootURL, sal_True, rLang ); + AppendConfigToken( aHelpRootURL, sal_True); Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL ); /* rURL may be @@ -815,12 +814,12 @@ sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const S if ( !impl_hasHelpInstalled() ) { if ( impl_showOnlineHelp( aHelpURL ) ) - return TRUE; + return sal_True; else { NoHelpErrorBox aErrBox( const_cast< Window* >( pWindow ) ); aErrBox.Execute(); - return FALSE; + return sal_False; } } diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index bd9e574476..4924f0184f 100755 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -98,7 +98,7 @@ static sal_uInt16 nTimeOut = 300; static sal_uInt32 nCache1 = 0; static sal_uInt32 nCache2 = 0; -typedef boost::unordered_map< USHORT, bool > InvalidateSlotMap; +typedef boost::unordered_map< sal_uInt16, bool > InvalidateSlotMap; //==================================================================== diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index bc2d04a12a..83873237f5 100755 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -770,7 +770,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util bSuccess = aReq.IsDone() || pItem != NULL; if ( bVBARequest ) { - SFX_REQUEST_ARG( aReq, pDlgRet, SfxBoolItem, SID_DIALOG_RETURN, FALSE ); + SFX_REQUEST_ARG( aReq, pDlgRet, SfxBoolItem, SID_DIALOG_RETURN, sal_False ); if ( pDlgRet ) { bSuccess = pDlgRet->GetValue(); diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 9da5724085..6d6c97037a 100755 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -254,7 +254,7 @@ short SfxPasswordDialog::Execute() Size a6Size = LogicToPixel( Size( 6, 6 ), MAP_APPFONT ); long nMinHeight = maHelpBtn.GetPosPixel().Y() + maHelpBtn.GetSizePixel().Height() + a6Size.Height(); - USHORT nRowHided = 1; + sal_uInt16 nRowHided = 1; if ( SHOWEXTRAS_NONE == mnExtras ) { diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index a55b60d6c6..4473fe4b52 100755 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -606,7 +606,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize // Das Fenster mu\s vor dem ersten Fenster eingef"ugt werden, das die // gleiche oder eine gr"o\sere Position hat als pDockWin. sal_uInt16 nCount = pDockArr->Count(); - USHORT nLastWindowIdx(0); + sal_uInt16 nLastWindowIdx(0); // Wenn gar kein Fenster gefunden wird, wird als erstes eingef"ugt sal_uInt16 nInsertPos = 0; diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 203c1f83fc..084c8aa927 100755 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -388,7 +388,7 @@ const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot const SfxItemPool* pPool = rSet.GetPool(); sal_uInt16 nWh = pPool->GetWhich( nSlot, bDeep ); const SfxPoolItem* pItem = 0; - rSet.GetItemState( nWh, TRUE, &pItem ); + rSet.GetItemState( nWh, sal_True, &pItem ); if ( !pItem && nWh != nSlot ) pItem = &pPool->GetDefaultItem( nWh ); diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index b33b20b4b1..3ee4c70b07 100755 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -185,7 +185,7 @@ namespace sfx2 aCommandName.append( sImageURL.copy( nCommandImagePrefixLen ) ); const ::rtl::OUString sCommandName( aCommandName.makeStringAndClear() ); - const Image aPanelImage( GetImage( i_rDocFrame, sCommandName, FALSE ) ); + const Image aPanelImage( GetImage( i_rDocFrame, sCommandName, sal_False ) ); return aPanelImage.GetXGraphic(); } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 80769329ff..66aa0aaee9 100755 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -692,9 +692,10 @@ StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr) if(pCmp->aName == pEntry->aParent) { // initial sortiert einfuegen - sal_uInt16 ii; + sal_uInt16 nPos; for( nPos = 0 ; nPos < pCmp->Count() && - aSorter.compare((*pCmp->pChilds)[nPos]->aName, pEntry->aName) < 0 ; nPos++); + aSorter.compare((*pCmp->pChilds)[nPos]->aName, pEntry->aName) < 0 ; nPos++) + {}; pCmp->Put(pEntry,nPos); break; } @@ -865,8 +866,8 @@ sal_uInt16 SfxCommonTemplateDialog_Impl::InfoOffsetToStyleNr(sal_uInt16 nId) void SfxCommonTemplateDialog_Impl::ReadResource() { // globale Benutzer-Resource auslesen - sal_uInt16 i; - for(i = 0; i < MAX_FAMILIES; ++i) + + for(sal_uInt16 i = 0; i < MAX_FAMILIES; ++i) pFamilyState[i] = 0; SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame(); @@ -895,7 +896,7 @@ void SfxCommonTemplateDialog_Impl::ReadResource() for(i = 0; i < nCount; ++i) { sal_uInt16 nSlot = 0; - switch( (USHORT)pStyleFamilies->at( i )->GetFamily() ) + switch( (sal_uInt16)pStyleFamilies->at( i )->GetFamily() ) { case SFX_STYLE_FAMILY_CHAR: nSlot = SID_STYLE_FAMILY1; break; case SFX_STYLE_FAMILY_PARA: nSlot = SID_STYLE_FAMILY2; break; @@ -1332,7 +1333,8 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) //Bubblesort sal_uInt16 nPos; for( nPos = aStrings.Count() ; nPos && - aSorter.compare(*(aStrings[nPos-1]), pStyle->GetName()) > 0 ; nPos--); + aSorter.compare(*(aStrings[nPos-1]), pStyle->GetName()) > 0 ; nPos--) + {}; aStrings.Insert( new String( pStyle->GetName() ), nPos ); pStyle = pStyleSheetPool->Next(); } @@ -1356,7 +1358,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) nPos = 0; for(nPos = 0 ; nPos < nCount ; ++nPos ) { - aFmtLb.InsertEntry( *aStrings.GetObject( nPos ), 0, FALSE, nPos); + aFmtLb.InsertEntry( *aStrings.GetObject( nPos ), 0, sal_False, nPos); } aFmtLb.SetUpdateMode(true); } @@ -2288,7 +2290,7 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl( pDlgWindow->FreeResource(); SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame(); pCurObjShell = pViewFrame->GetObjectShell(); - USHORT nSavedFilter = static_cast< USHORT >( LoadFactoryStyleFilter( pCurObjShell ) ); + sal_uInt16 nSavedFilter = static_cast< sal_uInt16 >( LoadFactoryStyleFilter( pCurObjShell ) ); Initialize(); m_aActionTbL.SetSelectHdl(LINK(this, SfxTemplateDialog_Impl, ToolBoxLSelect)); @@ -2302,7 +2304,7 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl( m_aActionTbL.SetHelpId( HID_TEMPLDLG_TOOLBOX_LEFT ); if( nSavedFilter == HIERARCHICAL_FILTER_INDEX ) { - bHierarchical = FALSE; // Force content refresh + bHierarchical = sal_False; // Force content refresh aFilterLb.SelectEntry(String(SfxResId(STR_STYLE_FILTER_HIERARCHICAL))); FilterSelectHdl(&aFilterLb); } diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index fd45e858bf..aa983a8af3 100755 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -614,7 +614,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) SetError( nError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); if (pMedium->GetFilter()->GetFilterFlags() & SFX_FILTER_STARTPRESENTATION) - pSet->Put( SfxBoolItem( SID_DOC_STARTPRESENTATION, TRUE) ); + pSet->Put( SfxBoolItem( SID_DOC_STARTPRESENTATION, sal_True) ); } EnableSetModified( sal_False ); diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index f460ec946f..24094e2f94 100755 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -3674,7 +3674,7 @@ void SAL_CALL SfxBaseModel::switchToStorage( const uno::Reference< XSTORAGE >& x xUICfgMgrStorage->setStorage( xStorage ); } } - m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = FALSE; + m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = sal_False; } uno::Reference< XSTORAGE > SAL_CALL SfxBaseModel::getDocumentStorage() diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 8d53079c1f..23f5b72ab9 100755 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -101,7 +101,7 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const OUSTRING & aName, const ANY & ::rtl::OUString sType; if ( ( aNormalizedDescriptor.size() == 1 ) - && ( aProperties[0].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_EVENT_TYPE)) ) + && ( aNormalizedDescriptor.has( PROP_EVENT_TYPE) == 0 ) && ( aNormalizedDescriptor.get( PROP_EVENT_TYPE ) >>= sType ) && ( sType.getLength() == 0 ) ) diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 263358ca0a..09e624c27c 100755 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -582,7 +582,7 @@ SfxPoolItem* SfxFrameItem::Clone( SfxItemPool *) const return pNew; } -bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const +bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const { if ( wFrame ) { @@ -593,7 +593,7 @@ bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const return sal_False; } -bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) +bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) { Reference < XFrame > xFrame; if ( (rVal >>= xFrame) && xFrame.is() ) diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 890e13ffbb..10efcdc473 100755 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -792,7 +792,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) } if ( nId == SID_SETUPPRINTER ) { - rReq.AppendItem( SfxBoolItem( SID_DIALOG_RETURN, TRUE ) ); + rReq.AppendItem( SfxBoolItem( SID_DIALOG_RETURN, sal_True ) ); } // take the changes made in the dialog @@ -812,7 +812,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) rReq.SetReturnValue(SfxBoolItem(0,sal_False)); if ( nId == SID_SETUPPRINTER ) { - rReq.AppendItem( SfxBoolItem( SID_DIALOG_RETURN, FALSE ) ); + rReq.AppendItem( SfxBoolItem( SID_DIALOG_RETURN, sal_False ) ); } } } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 81d9e7dc10..5dd8b05f53 100755 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -438,7 +438,7 @@ enum ETypeFamily SAL_DLLPRIVATE void SfxViewShell::IPClientGone_Impl( SfxInPlaceClient *pIPClient ) { - SfxInPlaceClientList* pClientList = GetIPClientList_Impl(TRUE); + SfxInPlaceClientList* pClientList = GetIPClientList_Impl(sal_True); for( SfxInPlaceClientList::iterator it = pClientList->begin(); it < pClientList->end(); ++it ) { diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index b2707b01a6..3680c9f926 100755 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -55,7 +55,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\ svx/source/dialog/fontwork.src \ svx/source/dialog/frmsel.src \ svx/source/dialog/hdft.src \ - svx/source/dialog/hyprlink.src \ svx/source/dialog/imapdlg.src \ svx/source/dialog/langbox.src \ svx/source/dialog/language.src \ @@ -107,30 +106,30 @@ $(call gb_SrsTarget_get_clean_target,svx/res) : $(WORKDIR)/inc/svx/globlmn.hrc_c # just a temporary - globlmn.hrc about to be removed! ifeq ($(strip $(WITH_LANG)),) $(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc - echo copying $@ - -mkdir -p $(WORKDIR)/inc/svx - cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(WORKDIR)/inc/svx/globlmn.hrc - rm -f $(WORKDIR)/inc/svx/lastrun.mk + echo copying $@ + -mkdir -p $(WORKDIR)/inc/svx + cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(WORKDIR)/inc/svx/globlmn.hrc + rm -f $(WORKDIR)/inc/svx/lastrun.mk else -include $(WORKDIR)/inc/svx/lastrun.mk ifneq ($(gb_lastrun_globlmn),MERGED) .PHONY : $(WORKDIR)/inc/svx/globlmn.hrc endif $(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf - echo merging $@ - -mkdir -p $(WORKDIR)/inc/svx - rm -f $(WORKDIR)/inc/svx/lastrun.mk - echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/svx/lastrun.mk - $(call gb_Helper_abbreviate_dirs_native, \ - $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ - -p svx \ - -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf -l all) + echo merging $@ + -mkdir -p $(WORKDIR)/inc/svx + rm -f $(WORKDIR)/inc/svx/lastrun.mk + echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/svx/lastrun.mk + $(call gb_Helper_abbreviate_dirs_native, \ + $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ + -p svx \ + -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf -l all) endif .PHONY : $(WORKDIR)/inc/svx/globlmn.hrc_clean $(WORKDIR)/inc/svx/globlmn.hrc_clean : - rm -f $(WORKDIR)/inc/svx/lastrun.mk \ - $(WORKDIR)/inc/svx/globlmn.hrc + rm -f $(WORKDIR)/inc/svx/lastrun.mk \ + $(WORKDIR)/inc/svx/globlmn.hrc # vim: set noet sw=4 ts=4: diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 4ce5250f77..732526c338 100755 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -65,7 +65,6 @@ $(eval $(call gb_Library_add_linked_libs,svx,\ ucbhelper \ utl \ vcl \ - vos3 \ xo \ xcr \ $(gb_STDLIBS) \ @@ -117,7 +116,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/grfflt \ svx/source/dialog/hdft \ svx/source/dialog/hyperdlg \ - svx/source/dialog/hyprlink \ svx/source/dialog/imapdlg \ svx/source/dialog/imapwnd \ svx/source/dialog/measctrl \ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index dd31e6b4bd..45cf8fa1a8 100755 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -81,7 +81,6 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\ ucbhelper \ utl \ vcl \ - vos3 \ xo \ $(gb_STDLIBS) \ )) diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index d9288ea9e6..032f71ffa5 100755 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Module_add_targets,svx,\ AllLangResTarget_svx \ AllLangResTarget_ofa \ AllLangResTarget_gal \ - AllLangResTarget_about \ AllLangResTarget_textconversiondlgs \ Package_inc \ Package_sdi \ diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk index 81066e9c7b..11ad872fd7 100755 --- a/svx/Package_inc.mk +++ b/svx/Package_inc.mk @@ -83,7 +83,6 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdasitm.hxx,svx/sdasitm.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddrgmt.hxx,svx/svddrgmt.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnasit.hxx,svx/xlnasit.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlndsit.hxx,svx/xlndsit.hxx)) -$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hyprlink.hxx,svx/hyprlink.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/framelinkarray.hxx,svx/framelinkarray.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdetc.hxx,svx/svdetc.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmtit.hxx,svx/xflbmtit.hxx)) diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index 3015c6bdb9..47982f8683 100755 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -81,7 +81,7 @@ public: void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL); sal_uIntPtr GetCurrentPos() const; sal_uInt16 GetCurrentWhich() const; - virtual bool BegChangeEntry(ULONG nPos); + virtual bool BegChangeEntry(sal_uIntPtr nPos); virtual bool EndChangeEntry(); virtual void BrkChangeEntry(); diff --git a/svx/inc/svx/dlgutil.hxx b/svx/inc/svx/dlgutil.hxx index 039fa22476..d3f44537ef 100755 --- a/svx/inc/svx/dlgutil.hxx +++ b/svx/inc/svx/dlgutil.hxx @@ -40,7 +40,7 @@ class SfxItemSet; SVX_DLLPUBLIC FieldUnit GetModuleFieldUnit( const SfxItemSet& ); -SVX_DLLPUBLIC BOOL GetApplyCharUnit( const SfxItemSet& ); +SVX_DLLPUBLIC bool GetApplyCharUnit( const SfxItemSet& ); #define OUTPUT_DRAWMODE_COLOR (DRAWMODE_DEFAULT) #define OUTPUT_DRAWMODE_CONTRAST (DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT) diff --git a/svx/inc/svx/galtheme.hxx b/svx/inc/svx/galtheme.hxx index 4eccac2d36..005073be09 100755 --- a/svx/inc/svx/galtheme.hxx +++ b/svx/inc/svx/galtheme.hxx @@ -114,7 +114,7 @@ private: void ImplCreateSvDrawStorage(); SVX_DLLPUBLIC SgaObject* ImplReadSgaObject( GalleryObject* pEntry ); - BOOL ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry ); + sal_Bool ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry ); void ImplRead(); void ImplWrite(); const GalleryObject* ImplGetGalleryObject( size_t nPos ) const @@ -144,11 +144,11 @@ public: size_t GetObjectCount() const { return aObjectList.size(); } SVX_DLLPUBLIC SgaObject* AcquireObject( size_t nPos ); - SVX_DLLPUBLIC void ReleaseObject( SgaObject* pObj ); + SVX_DLLPUBLIC void ReleaseObject( SgaObject* pObj ); - SVX_DLLPUBLIC sal_Bool InsertObject( const SgaObject& rObj, sal_uIntPtr nPos = LIST_APPEND ); - SVX_DLLPUBLIC BOOL RemoveObject( size_t nPos ); - BOOL ChangeObjectPos( size_t nOldPos, size_t nNewPos ); + SVX_DLLPUBLIC bool InsertObject( const SgaObject& rObj, sal_uIntPtr nPos = LIST_APPEND ); + SVX_DLLPUBLIC bool RemoveObject( size_t nPos ); + bool ChangeObjectPos( size_t nOldPos, size_t nNewPos ); SVX_DLLPUBLIC const String& GetName() const; const String& GetRealName() const; diff --git a/svx/inc/svx/svdglue.hxx b/svx/inc/svx/svdglue.hxx index 8324e24f61..7e8b4f7657 100755 --- a/svx/inc/svx/svdglue.hxx +++ b/svx/inc/svx/svdglue.hxx @@ -75,7 +75,7 @@ class SVX_DLLPUBLIC SdrGluePoint { sal_uInt8 bUserDefined:1; // #i38892# public: SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0) { bNoPercent=sal_False; bReallyAbsolute=sal_False; bUserDefined=sal_True; } - SdrGluePoint(const Point& rNewPos, bool bNewPercent=TRUE, sal_uInt16 nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute=FALSE; bUserDefined=TRUE; } + SdrGluePoint(const Point& rNewPos, bool bNewPercent= sal_True, sal_uInt16 nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute = sal_False; bUserDefined = sal_True; } bool operator==(const SdrGluePoint& rCmpGP) const { return aPos==rCmpGP.aPos && nEscDir==rCmpGP.nEscDir && nId==rCmpGP.nId && nAlign==rCmpGP.nAlign && bNoPercent==rCmpGP.bNoPercent && bReallyAbsolute==rCmpGP.bReallyAbsolute && bUserDefined==rCmpGP.bUserDefined; } bool operator!=(const SdrGluePoint& rCmpGP) const { return !operator==(rCmpGP); } const Point& GetPos() const { return aPos; } diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index 4d1be3add1..0628a93e6d 100755 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -708,7 +708,7 @@ public: void ReformatAllTextObjects(); - bool HasTransparentObjects( sal_bool bCheckForAlphaChannel = sal_False ) const; + bool HasTransparentObjects( bool bCheckForAlphaChannel = false ) const; SdrOutliner* createOutliner( sal_uInt16 nOutlinerMode ); void disposeOutliner( SdrOutliner* pOutliner ); diff --git a/svx/inc/svx/svdotable.hxx b/svx/inc/svx/svdotable.hxx index 66dd81303c..22f80d3462 100755 --- a/svx/inc/svx/svdotable.hxx +++ b/svx/inc/svx/svdotable.hxx @@ -203,7 +203,7 @@ public: // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // der des EditOutliners) und die PaperSize gesetzt. virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, bool bNoEditText = false, ::Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth = sal_True ) const; + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const; virtual void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::Rectangle& rAnchorRect ) const; virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const; diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx index cd4ea83011..23ac8c5eaa 100755 --- a/svx/inc/svx/svdotext.hxx +++ b/svx/inc/svx/svdotext.hxx @@ -257,7 +257,7 @@ protected: sal_Bool mbTextAnimationAllowed : 1; // flag for preventing recursive onEditOutlinerStatusEvent calls - BOOL mbInDownScale : 1; + sal_Bool mbInDownScale : 1; SdrOutliner& ImpGetDrawOutliner() const; diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx index 227179b8b5..67cc1b70b3 100755 --- a/svx/inc/svx/svdundo.hxx +++ b/svx/inc/svx/svdundo.hxx @@ -144,7 +144,7 @@ protected: protected: SdrUndoObj(SdrObject& rNewObj); - void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, bool bRepeat = false) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, bool bRepeat = false) const; static void GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, bool bRepeat = false ); @@ -631,7 +631,7 @@ protected: protected: SdrUndoPage(SdrPage& rNewPg); - void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, sal_uInt16 n=0, bool bRepeat = false) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 n=0, bool bRepeat = false) const; }; //************************************************************ diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx index 61d74da1de..b0a3cb0cb1 100755 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -57,12 +57,12 @@ FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet ) return eUnit; } -BOOL GetApplyCharUnit( const SfxItemSet& rSet ) +bool GetApplyCharUnit( const SfxItemSet& rSet ) { - BOOL bUseCharUnit = FALSE; + bool bUseCharUnit = false; const SfxPoolItem* pItem = NULL; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_APPLYCHARUNIT, FALSE, &pItem ) ) - bUseCharUnit = (BOOL)( (const SfxBoolItem*)pItem )->GetValue(); + if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_APPLYCHARUNIT, sal_False, &pItem ) ) + bUseCharUnit = ((const SfxBoolItem*)pItem )->GetValue(); else { // FIXME - this might be wrong, cf. the DEV300 changes in GetModuleFieldUnit() @@ -77,7 +77,7 @@ BOOL GetApplyCharUnit( const SfxItemSet& rSet ) { pItem = pModule->GetItem( SID_ATTR_APPLYCHARUNIT ); if ( pItem ) - bUseCharUnit = (BOOL)( (SfxBoolItem*)pItem )->GetValue(); + bUseCharUnit = ((SfxBoolItem*)pItem )->GetValue(); } else { diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 458986034d..795cefc5e2 100755 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -1090,7 +1090,7 @@ void SvxFontWorkDialog::ApplyImageList() { ResMgr* _pMgr = &DIALOG_MGR(); - USHORT nBitmapResId = RID_SVXBMP_FONTWORK_FORM1; + sal_uInt16 nBitmapResId = RID_SVXBMP_FONTWORK_FORM1; sal_uInt16 nTextResId = RID_SVXSTR_FONTWORK_FORM1; bool bInit = aFormSet.GetItemCount() == 0; diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx deleted file mode 100755 index c874ca2121..0000000000 --- a/svx/source/dialog/hyprlink.cxx +++ /dev/null @@ -1,999 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svx.hxx" -#include <tools/urlobj.hxx> -#include <vcl/msgbox.hxx> -#include <unotools/configitem.hxx> -#include <unotools/cmdoptions.hxx> -#include <svtools/inetimg.hxx> -#include <svl/urlbmk.hxx> -#include <svl/eitem.hxx> -#include <svl/stritem.hxx> -#include <sfx2/viewfrm.hxx> -#include <sfx2/docfile.hxx> -#include <sfx2/imgmgr.hxx> -#include <sfx2/dispatch.hxx> -#include <svl/urihelper.hxx> -#include <sfx2/objsh.hxx> -#include <comphelper/processfactory.hxx> - -#include "svx/hlnkitem.hxx" -#include <svx/dialogs.hrc> -#include "hyprlink.hrc" -#include <svx/dialmgr.hxx> -#include "svx/hyprlink.hxx" -#include "hyprdlg.hxx" - -using namespace ::rtl; -using namespace ::com::sun::star; - -// ----------------------------------------------------------------------- - -class SearchDefaultConfigItem_Impl : public ::utl::ConfigItem -{ - OUString sDefaultEngine; -public: - SearchDefaultConfigItem_Impl(); - ~SearchDefaultConfigItem_Impl(); - - const OUString& GetDefaultSearchEngine(){ return sDefaultEngine;} - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - virtual void Commit(); -}; - -/*-- 11.11.2003 14:20:59--------------------------------------------------- - - -----------------------------------------------------------------------*/ -SearchDefaultConfigItem_Impl::SearchDefaultConfigItem_Impl() : - ConfigItem(OUString::createFromAscii("Inet/DefaultSearchEngine")) -{ - uno::Sequence<OUString> aNames(1); - aNames.getArray()[0] = OUString::createFromAscii("Name"); - uno::Sequence< uno::Any > aValues = GetProperties(aNames); - aValues.getConstArray()[0] >>= sDefaultEngine; -} -/*-- 11.11.2003 14:21:00--------------------------------------------------- - - -----------------------------------------------------------------------*/ -SearchDefaultConfigItem_Impl::~SearchDefaultConfigItem_Impl() -{ -} - -void SearchDefaultConfigItem_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) -{ -} - -void SearchDefaultConfigItem_Impl::Commit() -{ -} - -/************************************************************************* -|* -|* Dialog zum Einf"ugen/"Andern eines Hyperlink -|* -\************************************************************************/ - -SvxHyperlinkDlg::SvxHyperlinkDlg( SfxBindings *_pBindings, Window* pParent) : - - ToolBox ( pParent, SVX_RES( RID_SVXDLG_HYPERLINK ) ), - SfxControllerItem ( SID_HYPERLINK_SETLINK, *_pBindings ), - - aForwarder ( SID_HYPERLINK_GETLINK, *this ), - aHyperlinkDlgForward( SID_HYPERLINK_DIALOG , *this), - - aNameCB ( this, SVX_RES( CB_NAME ) ), - aUrlFT ( this, SVX_RES( FT_URL ) ), - aUrlCB ( this, SVX_RES( CB_URL ) ), - aSearchConfig (sal_True), - sAddress ( SVX_RES( STR_ADDRESS ) ), - sExplorer ( SVX_RES( STR_EXPLORER ) ), - sSearchTitle ( SVX_RES( STR_BOOKMARK_SEARCH ) ), - aLinkPopup ( SVX_RES( RID_SVXMN_HYPERLINK ) ), - pTargetMenu ( NULL ), - - bNoDoc ( sal_True ), - bSend ( sal_False ), - bHasOldName ( sal_False ), - bHtmlMode ( sal_False ) - -{ - FreeResource(); - - mpManager = SfxImageManager::GetImageManager( 0 ); - mpManager->RegisterToolBox( this ); - - SetImages(); - - // save initial size - nMaxWidth = GetSizePixel().Width(); - nMaxHeight = GetSizePixel().Height(); - - - InsertSeparator( 0 ); - InsertWindow( CB_URL, &aUrlCB, 0, 0 ); - // we need an item text for accessibility - String sItemText = aUrlCB.GetText(); - if ( sItemText.Len() == 0 ) - sItemText = aUrlCB.GetQuickHelpText(); - if ( sItemText.Len() > 0 ) - { - SetItemText( CB_URL, sItemText ); - sItemText.Erase(); - } - InsertWindow( FT_URL, &aUrlFT, 0, 0 ); - InsertSeparator( 0 ); - InsertWindow( CB_NAME, &aNameCB, 0, 0 ); - sItemText = aNameCB.GetText(); - if ( sItemText.Len() == 0 ) - sItemText = aNameCB.GetQuickHelpText(); - if ( sItemText.Len() > 0 ) - SetItemText( CB_NAME, sItemText ); - - SetSizePixel(CalcWindowSizePixel()); // Groesse initialisieren - - nMaxHeight = GetSizePixel().Height(); // Hoehe nochmal merken, da sie veraendert wurde - // SetSizePixel ruft Resize-Handler! - - Show(); - Resize(); - - long nUrlWidth = aUrlCB.GetResizeWidth(); - long nNameWidth = aNameCB.GetResizeWidth(); - long nSum = nUrlWidth + nNameWidth; - - aUrlCB.SetRatio((nUrlWidth * 100L) / nSum); - aNameCB.SetRatio((nNameWidth * 100L) / nSum); - - SetClickHdl( LINK( this, SvxHyperlinkDlg, TBClickHdl ) ); - SetSelectHdl( LINK( this, SvxHyperlinkDlg, TBSelectHdl ) ); - SetDropdownClickHdl( LINK( this, SvxHyperlinkDlg, DropdownClick ) ); - - SetItemBits( BTN_TARGET, GetItemBits( BTN_TARGET ) | TIB_DROPDOWNONLY ); - SetItemBits( BTN_INET_SEARCH, GetItemBits( BTN_INET_SEARCH ) | TIB_DROPDOWN ); - SetItemBits( BTN_INET_SEARCH, GetItemBits( BTN_TARGET ) | TIB_DROPDOWNONLY ); - - aLinkPopup.SetSelectHdl(LINK(this, SvxHyperlinkDlg, LinkPopupSelectHdl)); - - Link aLk = LINK(this, SvxHyperlinkDlg, ComboSelectHdl); - aNameCB.SetSelectHdl(aLk); - aUrlCB.SetSelectHdl(aLk); - - aLk = LINK(this, SvxHyperlinkDlg, ComboModifyHdl); - aNameCB.SetModifyHdl(aLk); - aUrlCB.SetModifyHdl(aLk); - - // Accessibility: Set the quick help text as accessible name for the - // drop down lists. - aNameCB.SetAccessibleName (aNameCB.GetQuickHelpText()); - aUrlCB.SetAccessibleName (aUrlCB.GetQuickHelpText()); - - // Hide button according to config item. - SvtCommandOptions aCmdOpts; - if ( aCmdOpts.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "InternetSearch" ) ) ) ) - HideItem( BTN_INET_SEARCH ); -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -SvxHyperlinkDlg::~SvxHyperlinkDlg() -{ - SfxImageManager::GetImageManager( 0 )->ReleaseToolBox(this); - - if (pTargetMenu != NULL) - delete pTargetMenu; -} - -/*-------------------------------------------------------------------- - Beschreibung: Leiste so resizen, dass die Comboboxen automatisch mit - verkleinert werden - --------------------------------------------------------------------*/ - -void SvxHyperlinkDlg::Resize() -{ - long nWidth = GetSizePixel().Width(); - - ToolBox::Resize(); - - if (nWidth) // nWidth ist manchmal 0 - { - long nDeltaW = nMaxWidth - nWidth + aUrlCB.LogicToPixel(Size(3, 1)).Width() + 1; - - long nNewUrlWidth = aUrlCB.CalcResizeWidth(nDeltaW); - long nNewNameWidth = aNameCB.CalcResizeWidth(nDeltaW); - - if (nNewUrlWidth && nNewNameWidth) // Flackern reduzieren - { - SetUpdateMode(sal_False); - - // Comboboxen resizen - aUrlCB.DoResize(nNewUrlWidth); - aNameCB.DoResize(nNewNameWidth); - RecalcItems(); // Alle Elemente neu anordnen - - SetUpdateMode(sal_True); - } - } -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -void SvxHyperlinkDlg::Resizing(Size& rSize) -{ - if (rSize.Height() > nMaxHeight) - rSize.Height() = nMaxHeight; - - if (rSize.Width() > nMaxWidth) - rSize.Width() = nMaxWidth; - - ToolBox::Resizing(rSize); -} - -/*-------------------------------------------------------------------- - Beschreibung: Im Dokument selektierten Hyperlink in Leiste anzeigen - --------------------------------------------------------------------*/ - -void SvxHyperlinkDlg::StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) -{ - if ( nSID == SID_HYPERLINK_DIALOG ) - { - if( eState != SFX_ITEM_DISABLED) - { - EnableItem( BTN_OPENDIALOG, sal_True ); - - sal_Bool bItem = sal_False; - if ( pState && eState == SFX_ITEM_AVAILABLE ) - bItem = ((SfxBoolItem*)pState)->GetValue(); - SetItemState ( BTN_OPENDIALOG, bItem ? STATE_CHECK : STATE_NOCHECK ); - } - else - { - SetItemState ( BTN_OPENDIALOG, STATE_NOCHECK ); - EnableItem( BTN_OPENDIALOG, sal_False ); - } - } - - if (nSID == SID_HYPERLINK_SETLINK) - { - if (eState == SFX_ITEM_DISABLED) - bNoDoc = sal_True; - else - bNoDoc = sal_False; - EnableItem(BTN_TARGET, !bNoDoc); - EnableLink(); - } - - if (nSID == SID_HYPERLINK_GETLINK) - { - if (eState == SFX_ITEM_AVAILABLE) - { - const SvxHyperlinkItem& rHLnkItem = *((const SvxHyperlinkItem*)pState); - - sal_uInt16 nNamePos = aNameCB.GetEntryPos(aNameCB.GetText()); - sal_uInt16 nUrlPos = aUrlCB.GetEntryPos(aUrlCB.GetText()); - sal_uInt16 nNotFound = COMBOBOX_ENTRY_NOTFOUND; - - if (!bHasOldName && - (nNamePos == nNotFound || nUrlPos == nNotFound)) - { - sOldName = aNameCB.GetText(); - bHasOldName = sal_True; - } - if (rHLnkItem.GetName().Len()) - { - aNameCB.SetText(rHLnkItem.GetName()); - ComboModifyHdl(&aNameCB); - } - if (rHLnkItem.GetURL().Len() || rHLnkItem.GetName().Len()) - { - String sUrl = INetURLObject(rHLnkItem.GetURL()).GetURLNoPass(); - aUrlCB.SetText(sUrl); - } - else if (aUrlCB.GetEntryCount()) - { // Letzten Eintrag wieder selektieren - aNameCB.SetText(aNameCB.GetEntry(0)); - aUrlCB.SetText(aUrlCB.GetEntry(0)); - } - - TargetMenu(rHLnkItem.GetTargetFrame(), sal_False); - bHtmlMode = (rHLnkItem.GetInsertMode() & HLINK_HTMLMODE) != 0; - } - else - return; - - ComboModifyHdl(&aUrlCB); - } -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -IMPL_LINK( SvxHyperlinkDlg, TBClickHdl, ToolBox *, pBox ) -{ - switch (pBox->GetCurItemId()) - { - case BTN_LINK: - { - if (!bSend) // Link ins Dokument einfuegen - SendToApp(HLINK_DEFAULT); - } - break; - - case BTN_OPENDIALOG: - { - GetBindings().GetDispatcher()->Execute( SID_HYPERLINK_DIALOG ); - } - break; - } - - return sal_True; -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -IMPL_LINK( SvxHyperlinkDlg, TBSelectHdl, ToolBox *, pBox ) -{ - switch (pBox->GetCurItemId()) - { - // Link als Bookmark im Explorer eintragen - // Soll erst im Loslassen der Maus gerufen werden, daher im Select-Hdl - case BTN_INSERT_BOOKMARK: - { - String sName = aNameCB.GetText(); - if ( !sName.Len() ) - sName = aUrlCB.GetText(); - - String aBase = GetBindings().GetDispatcher()->GetFrame()->GetObjectShell()->GetMedium()->GetBaseURL(); - SfxStringItem aName( SID_BOOKMARK_TITLE, sName ); - SfxStringItem aURL( SID_BOOKMARK_URL, - URIHelper::SmartRel2Abs( INetURLObject(aBase), aUrlCB.GetText(), URIHelper::GetMaybeFileHdl(), true, false, - INetURLObject::WAS_ENCODED, - INetURLObject::DECODE_UNAMBIGUOUS ) ); - GetBindings().GetDispatcher()->Execute( - SID_CREATELINK, SFX_CALLMODE_ASYNCHRON, &aName, &aURL, 0L ); - } - break; - } - - return sal_True; -} - -IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox ) -{ - switch (pBox->GetCurItemId()) - { - case BTN_LINK: - { - // Link-Popup anstossen - EndSelection(); // Vor dem Execute, damit Popup den Focus bekommt - aLinkPopup.EnableItem(MN_BUTTON, !bHtmlMode); - aLinkPopup.Execute( this, GetItemRect( BTN_LINK ), FLOATWIN_POPUPMODE_DOWN ); - } - break; - - case BTN_INET_SEARCH: - { - // Search-Engines per Popup auswaehlen - PopupMenu *pMenu = new PopupMenu; - pMenu->SetSelectHdl(LINK(this, SvxHyperlinkDlg, SearchPopupSelectHdl)); - SearchDefaultConfigItem_Impl aDefaultEngine; - String sDefault(aDefaultEngine.GetDefaultSearchEngine()); - sDefault.ToLowerAscii(); - const bool bHasDefault = sDefault.Len() > 0; - - sal_uInt16 nCount = aSearchConfig.Count(); - String sFound; - for (sal_uInt16 i = 0; i < nCount; i++) - { - const SvxSearchEngineData& rData = aSearchConfig.GetData(i); - //check if it's the configured default search engine - String sTest(rData.sEngineName); - sTest.ToLowerAscii(); - bool bIsDefaultEngine = bHasDefault && STRING_NOTFOUND != sTest.Search( sDefault ); - //then put it at the top - if(i && bIsDefaultEngine) - { - pMenu->InsertItem( i + 1, rData.sEngineName, 0, 0); - pMenu->InsertSeparator(1); - } - else - { - if (i) - pMenu->InsertSeparator(); - pMenu->InsertItem( i + 1, rData.sEngineName); - } - } - pBox->SetItemDown(BTN_INET_SEARCH, sal_True, sal_True); - pMenu->Execute( this, GetItemRect( BTN_INET_SEARCH ), FLOATWIN_POPUPMODE_DOWN ); - pBox->SetItemDown(BTN_INET_SEARCH, sal_False, sal_True); - EndSelection(); - delete pMenu; - } - break; - - case BTN_TARGET: - { - // Target Frame einstellen - TargetMenu(GetSelTarget(), sal_True); - EndSelection(); - } - break; - } - - return sal_True; -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, sal_Bool bExecute) -{ - if (pTargetMenu && !bExecute) - { - for (sal_uInt16 i = 1; i <= pTargetMenu->GetItemCount(); i++) - { - if (pTargetMenu->GetItemText(i) == rSelEntry) - { - pTargetMenu->CheckItem(i); - return; - } - } - } - - SfxViewFrame* pVwFrm = SfxViewFrame::Current(); - - if (pVwFrm) // Alle moeglichen Target Frames zusammensammeln und anzeigen - { - TargetList aList; - pVwFrm->GetTopFrame().GetTargetList(aList); - - sal_uInt16 nCount = (sal_uInt16)aList.Count(); - if( nCount ) - { - sal_Bool bChecked = sal_False; - - if (pTargetMenu != NULL) - delete pTargetMenu; - - pTargetMenu = new PopupMenu; - pTargetMenu->SetMenuFlags( pTargetMenu->GetMenuFlags() | - MENU_FLAG_NOAUTOMNEMONICS ); - sal_uInt16 i; - for ( i = 0; i < nCount; i++ ) - { - String sEntry(*aList.GetObject(i)); - pTargetMenu->InsertItem(i + 1, sEntry, MIB_RADIOCHECK|MIB_AUTOCHECK); - - if (sEntry == rSelEntry) - { - pTargetMenu->CheckItem(i + 1); - bChecked = sal_True; - } - } - for ( i = nCount; i; i-- ) - delete aList.GetObject( i - 1 ); - - if (!bChecked) - pTargetMenu->CheckItem(1); - - if (bExecute) - { - sal_uInt16 nEntry = pTargetMenu->Execute( - this, GetItemRect( BTN_TARGET ), FLOATWIN_POPUPMODE_DOWN ); - if ( nEntry ) - pTargetMenu->CheckItem( nEntry ); - } - } - } -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -IMPL_LINK( SvxHyperlinkDlg, LinkPopupSelectHdl, Menu *, pMenu ) -{ - switch (pMenu->GetCurItemId()) - { - case MN_FIELD: // URL als Hyperlink ins Dok einfuegen - SendToApp(HLINK_FIELD); - break; - case MN_BUTTON: // URL als Button ins Dok einfuegen - SendToApp(HLINK_BUTTON); - break; - } - - return sal_True; -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -IMPL_LINK( SvxHyperlinkDlg, SearchPopupSelectHdl, Menu *, pMenu ) -{ - const SvxSearchEngineData& rData = aSearchConfig.GetData(pMenu->GetCurItemId() - 1); - String sText(aNameCB.GetText()); - sText.EraseLeadingChars().EraseTrailingChars(); - - rtl::OUString sPrefix; - rtl::OUString sSuffix; - rtl::OUString sSeparator; - sal_Int32 nCaseMatch; - sal_Unicode cToken = 0; - - if (sText.Search(' ') != STRING_NOTFOUND) - { - sPrefix = rData.sExactPrefix; - sSuffix = rData.sExactSuffix; - sSeparator = rData.sExactSeparator; - nCaseMatch = rData.nExactCaseMatch; - cToken = ' '; - } - else if (sText.Search('+') != STRING_NOTFOUND) - { - sPrefix = rData.sAndPrefix; - sSuffix = rData.sAndSuffix; - sSeparator = rData.sAndSeparator; - nCaseMatch = rData.nAndCaseMatch; - cToken = '+'; - } - else if (sText.Search(',') != STRING_NOTFOUND) - { - sPrefix = rData.sOrPrefix; - sSuffix = rData.sOrSuffix; - sSeparator = rData.sOrSeparator; - nCaseMatch = rData.nOrCaseMatch; - cToken = ','; - } - else - { - sPrefix = rData.sExactPrefix; - sSuffix = rData.sExactSuffix; - nCaseMatch = rData.nExactCaseMatch; - cToken = 0; - } - - String sURL = sPrefix; - xub_StrLen nTok; - - if(1 == nCaseMatch) - sText.ToUpperAscii(); - else if(2 == nCaseMatch) - sText.ToLowerAscii(); - - if ((nTok = sText.GetTokenCount(cToken)) > 1) - { - for (sal_uInt16 i = 0; i < nTok; i++) - { - sURL += sText.GetToken(i, cToken); - if(i < nTok -1) - sURL += (String)sSeparator; - } - sURL += (String)sSuffix; - } - else - { - sURL += sText; - sURL += (String)sSuffix; - } - sURL.EraseAllChars(); // remove all spaces - SfxViewFrame* pViewFrame = SfxViewFrame::Current(); - if ( pViewFrame ) - pViewFrame = pViewFrame->GetTopViewFrame(); - OpenDoc( sURL, pViewFrame ); - - return sal_True; -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -IMPL_LINK( SvxHyperlinkDlg, BookmarkFoundHdl, String *, pUrl ) -{ - if (pUrl && pUrl->Len()) - { - aUrlCB.SetText(*pUrl); - ComboModifyHdl(&aUrlCB); - } - - return sal_True; -} -/*-------------------------------------------------------------------- - Beschreibung: Link-Button enablen/disablen - --------------------------------------------------------------------*/ - -void SvxHyperlinkDlg::EnableLink() -{ - sal_Bool bEnable = aUrlCB.GetText().Len() != 0; - - EnableItem(BTN_LINK, (!bNoDoc) & bEnable); -} - -/*-------------------------------------------------------------------- - Beschreibung: URL im Dokument einfuegen - --------------------------------------------------------------------*/ - -void SvxHyperlinkDlg::SendToApp(sal_uInt16 nType) -{ - sal_Bool bIsFile = sal_False; - bSend = sal_True; - String sURL( aUrlCB.GetText() ); - - if ( !sURL.Len() ) - return; - - String aBase = GetBindings().GetDispatcher()->GetFrame()->GetObjectShell()->GetMedium()->GetBaseURL(); - INetURLObject aObj( URIHelper::SmartRel2Abs( INetURLObject(aBase), sURL, URIHelper::GetMaybeFileHdl(), true, false, - INetURLObject::WAS_ENCODED, - INetURLObject::DECODE_UNAMBIGUOUS ) ); - sURL = aObj.GetMainURL( INetURLObject::NO_DECODE ); - if ( aObj.GetProtocol() == INET_PROT_FILE ) - bIsFile = sal_True; - - if ( bIsFile ) - { - EnterWait(); - SfxMedium aMedium( sURL, STREAM_STD_READ, sal_True ); - if ( aMedium.Exists( sal_False ) == sal_False ) - { - LeaveWait(); - QueryBox aBox( this, SVX_RES( RID_SVXQB_DONTEXIST ) ); - if ( aBox.Execute() == RET_NO ) - return; - } - else - LeaveWait(); - } - - SvxHyperlinkItem aItem( SID_HYPERLINK_SETLINK ); - - if (aNameCB.GetText().Len()) - aItem.SetName( aNameCB.GetText() ); - else - aItem.SetName( sURL ); - - sOldName = aNameCB.GetText(); - - aItem.SetURL(sURL); - aItem.SetInsertMode( (SvxLinkInsertMode)nType ); - aItem.SetTargetFrame( GetSelTarget() ); - - GetBindings().GetDispatcher()->Execute( - SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); - - AddToHistory( aNameCB.GetText(), sURL ); - - if ( sURL != aUrlCB.GetText() ) - aUrlCB.SetText( sURL ); -} - -/*-------------------------------------------------------------------- - Beschreibung: Selektierten Target Frame Eintrag im Popup ermitteln - --------------------------------------------------------------------*/ - -String SvxHyperlinkDlg::GetSelTarget() -{ - String sTarget; - - if (pTargetMenu != NULL) - { - for (sal_uInt16 i = 1; i <= pTargetMenu->GetItemCount(); i++) - { - if (pTargetMenu->IsItemChecked(i)) - { - sTarget = pTargetMenu->GetItemText(i); - break; - } - } - } - - return sTarget; -} - -/*-------------------------------------------------------------------- - Beschreibung: URL in History der Leiste aufnehmen - --------------------------------------------------------------------*/ - -void SvxHyperlinkDlg::AddToHistory(const String& rName, const String& rURL) -{ - String sName(rName); - - if (bHasOldName && sOldName.Len()) - { - sName = sOldName; - bHasOldName = sal_False; - } - - if (!sName.Len()) - sName = rURL; - - if (rURL.Len()) - { - sal_uInt16 nNamePos = aNameCB.GetEntryPos(sName); - sal_uInt16 nUrlPos = aUrlCB.GetEntryPos(rURL); - sal_uInt16 nPos = COMBOBOX_ENTRY_NOTFOUND; - - if (nNamePos != COMBOBOX_ENTRY_NOTFOUND) - nPos = nNamePos; - else - nPos = nUrlPos; - - // Alten Eintrag durch neuen Eintrag ersetzen - if (nPos != COMBOBOX_ENTRY_NOTFOUND) - { - aNameCB.RemoveEntry(nPos); - aUrlCB.RemoveEntry(nPos); - aNameCB.SetText(rName); - aUrlCB.SetText(rURL); - } - - aNameCB.InsertEntry(sName, 0); - aUrlCB.InsertEntry(rURL, 0); - } -} - -/*-------------------------------------------------------------------- - Beschreibung: Bookmark und Search-Button enablen/disablen - --------------------------------------------------------------------*/ - -IMPL_LINK( SvxHyperlinkDlg, ComboSelectHdl, ComboBox *, pCombo ) -{ - sal_uInt16 nPos = pCombo->GetEntryPos(pCombo->GetText()); - - if (nPos != COMBOBOX_ENTRY_NOTFOUND) - { - aNameCB.SetText(aNameCB.GetEntry(nPos)); - aUrlCB.SetText(aUrlCB.GetEntry(nPos)); - - EnableLink(); - EnableItem(BTN_INSERT_BOOKMARK, sal_True); - EnableItem(BTN_INET_SEARCH, sal_True); - } - return sal_True; -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -IMPL_LINK( SvxHyperlinkDlg, ComboModifyHdl, ComboBox *, pCombo ) -{ - sal_Bool bEnable = sal_True; - - if (!pCombo->GetText().Len()) - bEnable = sal_False; - - if (pCombo == &aNameCB) - { - if (IsItemEnabled(BTN_INET_SEARCH) != bEnable) - EnableItem(BTN_INET_SEARCH, bEnable); - } - - EnableLink(); - - if (aUrlCB.GetText().Len()) - bEnable = sal_True; - else - bEnable = sal_False; - - if (IsItemEnabled(BTN_INSERT_BOOKMARK) != bEnable) - EnableItem(BTN_INSERT_BOOKMARK, bEnable); - - return sal_True; -} - -// -------------------------------------------------------------------- - -void SvxHyperlinkDlg::DataChanged( const DataChangedEvent& rDCEvt ) -{ - ToolBox::DataChanged( rDCEvt ); - - if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE)) - SetImages(); -} - -// -------------------------------------------------------------------- - -void SvxHyperlinkDlg::SetImages() -{ - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - - SetItemImage( BTN_LINK, mpManager->GetImage( BTN_LINK, bHighContrast ) ); - SetItemImage( BTN_INSERT_BOOKMARK, mpManager->GetImage( BTN_INSERT_BOOKMARK, bHighContrast ) ); - SetItemImage( BTN_INET_SEARCH, mpManager->GetImage( BTN_INET_SEARCH, bHighContrast ) ); - SetItemImage( BTN_TARGET, mpManager->GetImage( BTN_TARGET, bHighContrast ) ); - SetItemImage( BTN_OPENDIALOG, mpManager->GetImage( BTN_OPENDIALOG, bHighContrast ) ); -} - -/*-------------------------------------------------------------------- - Beschreibung: Comboboxen - --------------------------------------------------------------------*/ - -HyperCombo::HyperCombo( SvxHyperlinkDlg* pDialog, const ResId& rResId ) : - ComboBox( (Window *)pDialog, rResId ) -{ - pDlg = pDialog; - - nMaxWidth = GetSizePixel().Width(); - if (this == &pDlg->aUrlCB) - nMinWidth = GetTextWidth(String::CreateFromAscii("http://www.stardiv.dewww")); - else - nMinWidth = GetTextWidth(String::CreateFromAscii("StarDivision GmbHwww")); -} - -/*-------------------------------------------------------------------- - Beschreibung: Comboboxen KeyInput - --------------------------------------------------------------------*/ - -long HyperCombo::Notify( NotifyEvent& rNEvt ) -{ - long nHandled = 0; - static sal_Bool bLocked = sal_False; - - if (bLocked) // Keine weiteren RETURNs annehmen (nicht Reentrant!) - return nHandled; - - bLocked = sal_True; - - if ( rNEvt.GetType() == EVENT_KEYINPUT ) - { - const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - const KeyCode aKeyCode = pKEvt->GetKeyCode(); - - if (aKeyCode.GetCode() == KEY_RETURN) - { - pDlg->SendToApp(HLINK_DEFAULT); - nHandled = 1; - } - } - if (this == &pDlg->aNameCB) - pDlg->sOldName = GetText(); - - if (!nHandled) - nHandled = ComboBox::Notify( rNEvt ); - - bLocked = sal_False; - - return nHandled; -} - -/*-------------------------------------------------------------------- - Beschreibung: Drag&Drop vor dem Combo-Edit abfangen und weiterleiten - --------------------------------------------------------------------*/ - -long HyperCombo::PreNotify( NotifyEvent& rNEvt ) -{ - long nHandled = 0; - - nHandled = ComboBox::PreNotify( rNEvt ); - - return nHandled; -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -long HyperCombo::CalcResizeWidth( long nW ) -{ - long nNewWidth = Max(nMaxWidth - nW * GetRatio() / 100L, nMinWidth); - - if (nNewWidth > nMaxWidth) - nNewWidth = nMaxWidth; - - if (nNewWidth != GetSizePixel().Width()) - return nNewWidth; - else - return 0; // Kein Resize notwendig -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -void HyperCombo::DoResize( long nNewWidth ) -{ - SetSizePixel(Size(nNewWidth, GetSizePixel().Height())); -} - -/*-------------------------------------------------------------------- - Beschreibung: FixedText - --------------------------------------------------------------------*/ - -HyperFixedText::HyperFixedText( SvxHyperlinkDlg* pDialog, const ResId& rResId ) : - FixedInfo( (Window *)pDialog, rResId ) -{ - pDlg = pDialog; -} - -/*-------------------------------------------------------------------- - Beschreibung: Webseite der Search-Engine mit Suchergebnissen anzeigen - --------------------------------------------------------------------*/ -void SvxHyperlinkDlg::OpenDoc( const String& rURL, SfxViewFrame* pViewFrame ) -{ - SfxStringItem aName( SID_FILE_NAME, rURL ); - SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii("private:user") ); - SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_True ); - SfxBoolItem aSilent( SID_SILENT, sal_True ); - SfxBoolItem aReadOnly( SID_DOC_READONLY, sal_True ); - SfxBoolItem aExternal( SID_BROWSE, sal_True ); - SfxDispatcher* pDisp = SfxViewFrame::Current() ? SfxViewFrame::Current()->GetDispatcher() : NULL; - - if ( pViewFrame ) - { - SfxFrameItem aView( SID_DOCFRAME, pViewFrame ? &pViewFrame->GetFrame() : NULL ); - if ( pDisp ) - pDisp->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, - &aName, &aView, &aNewView, &aSilent, &aReadOnly, &aReferer, &aExternal, 0L ); - } - else if ( pDisp ) - pDisp->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, - &aName, &aNewView, &aSilent, &aReadOnly, &aReferer, 0L ); -} -// class SvxHyperlinkDialogWrapper ------------------------------------------ - -SFX_IMPL_CHILDWINDOW(SvxHyperlinkDlgWrapper, SID_HYPERLINK_INSERT) - -/*-------------------------------------------------------------------- - Beschreibung: Wrapper fuer Hyperlinkleiste - --------------------------------------------------------------------*/ - -SvxHyperlinkDlgWrapper::SvxHyperlinkDlgWrapper( Window* _pParent, sal_uInt16 nId, - SfxBindings* _pBindings, SfxChildWinInfo* /*pInfo*/ ) : - - SfxChildWindow( _pParent, nId ) - -{ - pWindow = new SvxHyperlinkDlg( _pBindings, _pParent ); - eChildAlignment = SFX_ALIGN_TOP; -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -SfxChildWinInfo SvxHyperlinkDlgWrapper::GetInfo() const -{ - SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); - return aInfo; -} - diff --git a/svx/source/dialog/hyprlink.src b/svx/source/dialog/hyprlink.src deleted file mode 100755 index 4554a5f0bd..0000000000 --- a/svx/source/dialog/hyprlink.src +++ /dev/null @@ -1,167 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - // include ------------------------------------------------------------------ -#include <svx/dialogs.hrc> -#include "hyprlink.hrc" -#include "helpid.hrc" -#include <svx/svxids.hrc> - - // pragma ------------------------------------------------------------------- - - // RID_SVXDLG_HYPERLINK ------------------------------------------------------ -ToolBox RID_SVXDLG_HYPERLINK -{ - OutputSize = TRUE ; - Hide = TRUE; - - // Dockable = TRUE ; - // Closeable = TRUE ; - // Moveable = TRUE ; - // Sizeable = TRUE ; - // EnableResizing = TRUE ; - - SVLook = TRUE ; - Border = TRUE ; - Size = MAP_APPFONT ( 410 , 17 ) ; - Scroll = TRUE ; - HelpID = HID_OFA_HYPERLINK_DLG ; - - Text [ en-US ] = "Insert Hyperlink" ; - - ComboBox CB_NAME - { - HelpID = HID_OFA_HYPERLINK_NAME ; - Pos = MAP_APPFONT ( 2 , 3 ) ; - Size = MAP_APPFONT ( 100 , 60 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - AutoSize = TRUE ; - AutoHScroll = TRUE ; - DDExtraWidth = TRUE ; - QuickHelpText [ en-US ] = "URL Name" ; - }; - FixedText FT_URL - { - HelpID = HID_OFA_HYPERLINK_URL_TXT ; - Pos = MAP_APPFONT ( 105 , 5 ) ; - Size = MAP_APPFONT ( 16 , 10 ) ; - Text [ en-US ] = "URL:" ; - }; - ComboBox CB_URL - { - HelpID = HID_OFA_HYPERLINK_URL ; - Pos = MAP_APPFONT ( 121 , 3 ) ; - Size = MAP_APPFONT ( 204 , 60 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - AutoSize = TRUE ; - AutoHScroll = TRUE ; - DDExtraWidth = TRUE ; - QuickHelpText [ en-US ] = "Internet URLs" ; - }; - ItemList = - { - ToolBoxItem - { - HelpID = HID_OFA_HYPERLINK_TARGET ; - Identifier = BTN_TARGET ; - DropDown = TRUE ; - Text [ en-US ] = "Target Frame" ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - HelpID = CMD_SID_HYPERLINK_SETLINK ; - Identifier = BTN_LINK ; - Disable = TRUE ; - DropDown = TRUE ; - Text [ en-US ] = "Hyperlink" ; - }; - ToolBoxItem - { - HelpID = CMD_SID_CREATELINK ; - Identifier = BTN_INSERT_BOOKMARK ; - Disable = TRUE ; - Hide = TRUE; - Text [ en-US ] = "Link" ; - }; - ToolBoxItem - { - HelpID = HID_OFA_HYPERLINK_SEARCH ; - Identifier = BTN_INET_SEARCH ; - Disable = TRUE ; - DropDown = TRUE ; - Text [ en-US ] = "Find" ; - }; - }; - String STR_ADDRESS - { - Text [ en-US ] = "Address Book" ; - }; - String STR_EXPLORER - { - Text [ en-US ] = "Bookmark folder" ; - }; - String STR_BOOKMARK_SEARCH - { - Text [ en-US ] = "Search in bookmarks"; - }; -}; - // PopupMenu ------------------------------------------------------------- -Menu RID_SVXMN_HYPERLINK -{ - ItemList = - { - MenuItem - { - Identifier = MN_FIELD ; - Text [ en-US ] = "As Text" ; - }; - MenuItem - { - Identifier = MN_BUTTON ; - Text [ en-US ] = "As Button" ; - }; - }; -}; -QueryBox RID_SVXQB_DONTEXIST -{ - BUTTONS = WB_YES_NO ; - DEFBUTTON = WB_DEF_YES ; - Message [ en-US ] = "This URL does not exist.\nInsert anyway?" ; -}; - - - - - - - - diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 2ef8db9a6c..18fca58e65 100755 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -728,7 +728,7 @@ bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; - BOOL bRet = false; + bool bRet = false; switch ( nMemberId ) { case MID_START_X : bRet = (rVal >>= nStartX); break; diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx index 5e2cd71c61..ed6860409e 100755 --- a/svx/source/engine3d/svx3ditems.cxx +++ b/svx/source/engine3d/svx3ditems.cxx @@ -399,13 +399,13 @@ SfxPoolItem* Svx3DCloseBackItem::Create(SvStream& rIn, sal_uInt16 nItemVersion) ////////////////////////////////////////////////////////////////////////////// // Svx3DNormalsKindItem: use drawing::NormalsKind -sal_Bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::NormalsKind)GetValue(); return true; } -sal_Bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::NormalsKind eVar; if(!(rVal >>= eVar)) @@ -420,13 +420,13 @@ SfxPoolItem* Svx3DNormalsKindItem::Clone(SfxItemPool* /*pPool*/) const } // Svx3DTextureProjectionXItem: use drawing::TextureProjectionMode -sal_Bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextureProjectionMode)GetValue(); return true; } -sal_Bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextureProjectionMode eVar; if(!(rVal >>= eVar)) @@ -441,13 +441,13 @@ SfxPoolItem* Svx3DTextureProjectionXItem::Clone(SfxItemPool* /*pPool*/) const } // Svx3DTextureProjectionYItem: use drawing::TextureProjectionMode -sal_Bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextureProjectionMode)GetValue(); return true; } -sal_Bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextureProjectionMode eVar; if(!(rVal >>= eVar)) @@ -462,13 +462,13 @@ SfxPoolItem* Svx3DTextureProjectionYItem::Clone(SfxItemPool* /*pPool*/) const } // Svx3DTextureKindItem: use drawing::TextureKind -sal_Bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextureKind)GetValue(); return true; } -sal_Bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextureKind eVar; if(!(rVal >>= eVar)) @@ -483,13 +483,13 @@ SfxPoolItem* Svx3DTextureKindItem::Clone(SfxItemPool* /*pPool*/) const } // Svx3DTextureModeItem: use drawing:TextureMode -sal_Bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextureMode)GetValue(); return true; } -sal_Bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextureMode eVar; if(!(rVal >>= eVar)) @@ -504,13 +504,13 @@ SfxPoolItem* Svx3DTextureModeItem::Clone(SfxItemPool* /*pPool*/) const } // Svx3DPerspectiveItem: use drawing::ProjectionMode -sal_Bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::ProjectionMode)GetValue(); return true; } -sal_Bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::ProjectionMode eVar; if(!(rVal >>= eVar)) @@ -525,13 +525,13 @@ SfxPoolItem* Svx3DPerspectiveItem::Clone(SfxItemPool* /*pPool*/) const } // Svx3DShadeModeItem: use drawing::ShadeMode -sal_Bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::ShadeMode)GetValue(); return true; } -sal_Bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::ShadeMode eVar; if(!(rVal >>= eVar)) diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 0585de9bba..4ea9a6d723 100755 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -526,7 +526,7 @@ void Gallery::ImplWriteImportList() const sal_uInt32 nInventor = (sal_uInt32) COMPAT_FORMAT( 'S', 'G', 'A', '3' ); const sal_uInt16 nId = 0x0004; - *pOStm << nInventor << nId << (sal_uInt32) aImportList.Count() << (sal_uInt16) gsl_getSystemTextEncoding(); + *pOStm << nInventor << nId << (sal_uInt32) aImportList.size() << (sal_uInt16) gsl_getSystemTextEncoding(); for ( size_t i = 0, n = aImportList.size(); i < n; ++i ) *pOStm << *aImportList[ i ]; diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 4350f1ae9e..04d4e74d4b 100755 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -426,7 +426,7 @@ void GalleryTheme::UnlockBroadcaster( sal_uIntPtr nUpdatePos ) // ------------------------------------------------------------------------ -sal_Bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertPos ) +bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertPos ) { sal_Bool bRet = sal_False; @@ -565,7 +565,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg // LoeschFlag zuruecksetzen for (size_t i = 0; i < nCount; i++) - aObjectList[ i ]->bDummy = sal_False + aObjectList[ i ]->bDummy = sal_False; for(size_t i = 0; ( i < nCount ) && !bAbortActualize; i++) { @@ -647,7 +647,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg ::std::advance( it, i ); aObjectList.erase( it ); delete pEntry; - Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pEntry ) ) ); + Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uLong >( pEntry ) ) ); } else ++i; } diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 8dba04ae7c..70785c55ca 100755 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -178,9 +178,9 @@ class SAL_DLLPRIVATE FmXFormShell :public FmXFormShell_BASE FmFormArray m_aSearchForms; struct InvalidSlotInfo { - USHORT id; - BYTE flags; - inline InvalidSlotInfo(USHORT slotId, BYTE flgs) : id(slotId), flags(flgs) {}; + sal_uInt16 id; + sal_uInt8 flags; + inline InvalidSlotInfo(sal_uInt16 slotId, sal_uInt8 flgs) : id(slotId), flags(flgs) {}; }; std::vector<InvalidSlotInfo> m_arrInvalidSlots; // we explicitly switch off the propbrw before leaving the design mode diff --git a/svx/source/intro/about_ooo.src b/svx/source/intro/about_ooo.src deleted file mode 100755 index 487f9f012b..0000000000 --- a/svx/source/intro/about_ooo.src +++ /dev/null @@ -1,40 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <svtools/svtools.hrc> -#include "about_ooo.hrc" - -String ABOUT_STR_COPYRIGHT -{ - Text[ en-US ] = "Copyright © 2000, 2010 Oracle and/or its affiliates. All rights reserved.\nThis product was created by %OOOVENDOR, based on OpenOffice.org.\nOpenOffice.org acknowledges all community members, especially those mentioned at\n http://www.openoffice.org/welcome/credits.html."; -}; - -StringArray ABOUT_STR_DEVELOPER_ARY -{ - OOO_CONTRIBUTOR_LIST -}; - diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index 1e6c1c20f6..9d1014aa74 100755 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -31,15 +31,13 @@ // include --------------------------------------------------------------- -#include "modctrl.hxx" - #include <vcl/status.hxx> #include <vcl/image.hxx> #include <svl/eitem.hxx> #include <sfx2/app.hxx> #include <svx/dialogs.hrc> -#include "svx/modctrl.hxx" +#include <svx/modctrl.hxx> #include <svx/dialmgr.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 4682f48cb5..2b54168c9a 100755 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -2215,7 +2215,7 @@ SfxPoolItem* SdrGrafInvertItem::Clone( SfxItemPool* /*pPool*/) const return new SdrGrafInvertItem( *this ); } -SfxPoolItem* SdrGrafInvertItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrGrafInvertItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafInvertItem( rIn ); } diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 219da332dd..9bb5ac7711 100755 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -828,7 +828,7 @@ void SdrEditView::DistributeMarkedObjects() SvxDistributeVertical eVer = pDlg->GetDistributeVer(); ImpDistributeEntryList aEntryList; ImpDistributeEntryList::iterator itEntryList; - UINT32 nFullLength; + sal_uInt32 nFullLength; const bool bUndo = IsUndoEnabled(); if( bUndo ) @@ -875,7 +875,8 @@ void SdrEditView::DistributeMarkedObjects() for ( itEntryList = aEntryList.begin(); itEntryList < aEntryList.end() && (*itEntryList)->mnPos < pNew->mnPos; - ++itEntryList ); + ++itEntryList ) + {}; if ( itEntryList < aEntryList.end() ) aEntryList.insert( itEntryList, pNew ); else @@ -969,7 +970,8 @@ void SdrEditView::DistributeMarkedObjects() for ( itEntryList = aEntryList.begin(); itEntryList < aEntryList.end() && (*itEntryList)->mnPos < pNew->mnPos; - ++itEntryList ); + ++itEntryList ) + {}; if ( itEntryList < aEntryList.end() ) aEntryList.insert( itEntryList, pNew ); else diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 5214cdd204..338f6d677e 100755 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -477,7 +477,7 @@ bool SdrModel::Undo() bool SdrModel::Redo() { - bool bRet=FALSE; + bool bRet = false; if( mpImpl->mpUndoManager ) { OSL_FAIL("svx::SdrModel::Redo(), method not supported with application undo manager!"); diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index d292e46e18..2e8c65a1e4 100755 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -72,7 +72,6 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <osl/thread.hxx> -#include <vos/mutex.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; @@ -201,7 +200,7 @@ void SAL_CALL SdrGraphicUpdater::run(void) { Graphic aGraphic( ImpLoadLinkedGraphic( mrFileName, mrFilterName ) ); ::osl::MutexGuard aGuard(maMutex); - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; if ( !mbIsTerminated ) { mrGraphicLink.DataChanged( aGraphic ); diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index f070780ece..d4a95ca9d4 100755 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -1425,7 +1425,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) if (rStat.GetPointAnz()>=2) eCmd=SDRCREATE_FORCEEND; bRet = eCmd==SDRCREATE_FORCEEND; if (bRet) { - mbCreating = FALSE; + mbCreating = sal_False; delete pU; rStat.SetUser(NULL); } diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index f3fbe632bb..304c713d69 100755 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1436,8 +1436,8 @@ void SdrTextObj::ImpAutoFitText( SdrOutliner& rOutliner, const Size& rTextSize, // line-breaking text that we need some more samples // loop early-exits if we detect an already attained value - USHORT nMinStretchX=0, nMinStretchY=0; - USHORT aOldStretchXVals[]={0,0,0,0,0,0,0,0,0,0}; + sal_uInt16 nMinStretchX=0, nMinStretchY=0; + sal_uInt16 aOldStretchXVals[]={0,0,0,0,0,0,0,0,0,0}; const size_t aStretchArySize=sizeof(aOldStretchXVals)/sizeof(*aOldStretchXVals); for(unsigned int i=0; i<aStretchArySize; ++i) { @@ -1448,7 +1448,7 @@ void SdrTextObj::ImpAutoFitText( SdrOutliner& rOutliner, const Size& rTextSize, else fFactor = double(rTextSize.Height())/aCurrTextSize.Height(); - USHORT nCurrStretchX, nCurrStretchY; + sal_uInt16 nCurrStretchX, nCurrStretchY; rOutliner.GetGlobalCharStretching(nCurrStretchX, nCurrStretchY); if (fFactor >= 1.0 ) @@ -1465,17 +1465,17 @@ void SdrTextObj::ImpAutoFitText( SdrOutliner& rOutliner, const Size& rTextSize, if (fFactor < 1.0 || (fFactor >= 1.0 && nCurrStretchX != 100)) { - nCurrStretchX = sal::static_int_cast<USHORT>(nCurrStretchX*fFactor); - nCurrStretchY = sal::static_int_cast<USHORT>(nCurrStretchY*fFactor); - rOutliner.SetGlobalCharStretching(std::min(USHORT(100),nCurrStretchX), - std::min(USHORT(100),nCurrStretchY)); + nCurrStretchX = sal::static_int_cast<sal_uInt16>(nCurrStretchX*fFactor); + nCurrStretchY = sal::static_int_cast<sal_uInt16>(nCurrStretchY*fFactor); + rOutliner.SetGlobalCharStretching(std::min(sal_uInt16(100),nCurrStretchX), + std::min(sal_uInt16(100),nCurrStretchY)); OSL_TRACE("SdrTextObj::onEditOutlinerStatusEvent(): zoom is %d", nCurrStretchX); } } OSL_TRACE("---- SdrTextObj::onEditOutlinerStatusEvent(): final zoom is %d ----", nMinStretchX); - rOutliner.SetGlobalCharStretching(std::min(USHORT(100),nMinStretchX), - std::min(USHORT(100),nMinStretchY)); + rOutliner.SetGlobalCharStretching(std::min(sal_uInt16(100),nMinStretchX), + std::min(sal_uInt16(100),nMinStretchY)); } void SdrTextObj::SetupOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaintRect ) const diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 76d1fd2c87..7aa0a7aeef 100755 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -501,7 +501,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co Point aTemporaryTextRelativePosition(aLocalLogicPosition - aTextRect.TopLeft()); // FitToSize berueksichtigen - BOOL bFitToSize(pTextObj->IsFitToSize()); + bool bFitToSize(pTextObj->IsFitToSize()); if (bFitToSize) { Fraction aX(aTextRect.GetWidth()-1,aAnchor.GetWidth()-1); Fraction aY(aTextRect.GetHeight()-1,aAnchor.GetHeight()-1); diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 6d782582a1..30ac28e8aa 100755 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -677,7 +677,7 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled ) { mpLightingSet->SetItemImage( nItemId + 1, - (USHORT)nDirection == nItemId ? maImgLightingOn[nItemId] : maImgLightingOff[nItemId] + (sal_uInt16)nDirection == nItemId ? maImgLightingOn[nItemId] : maImgLightingOff[nItemId] ); } } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index ddb126e822..a0a974f4c4 100755 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2010,7 +2010,7 @@ void SvxStyleToolBoxControl::FillStyleBox() } else { - USHORT i= 0; + sal_uInt16 i= 0; while ( pStyle && !bDoFill ) { bDoFill = ( pBox->GetEntry(i) != pStyle->GetName() ); diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index c6fe02b9a2..350a0fd9de 100755 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -916,7 +916,7 @@ uno::Sequence< OUString > UHashMap::getServiceNames() return aSeq; } -UINT32 UHashMap::getId( const OUString& rCompareString ) +sal_uInt32 UHashMap::getId( const OUString& rCompareString ) { const UHashMapImpl &rMap = GetUHashImpl(); UHashMapImpl::const_iterator it = rMap.find( rCompareString ); diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 1610987daa..d588ef526b 100755 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -216,6 +216,15 @@ private: com::sun::star::task::XInteractionRequest > const & rRequest) SAL_THROW((com::sun::star::uno::RuntimeException)); + void + handleNameClashResolveRequest( + com::sun::star::ucb::NameClashResolveRequest const & rRequest, + com::sun::star::uno::Sequence< + com::sun::star::uno::Reference< + com::sun::star::task::XInteractionContinuation > > const & + rContinuations) + SAL_THROW((com::sun::star::uno::RuntimeException)); + bool handleMasterPasswordRequest( com::sun::star::uno::Reference< diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 0544171dbf..4e91bd83f7 100755 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -54,11 +54,10 @@ $(eval $(call gb_Library_add_linked_libs,xo,\ cppuhelper \ i18nisolang1 \ sal \ - stl \ + salhelper \ svl \ tl \ utl \ - vos3 \ $(gb_STDLIBS) \ )) diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index 455daadaf6..d891888645 100755 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -43,9 +43,7 @@ $(eval $(call gb_Library_add_linked_libs,xof,\ cppuhelper \ sal \ salhelper \ - stl \ xo \ - $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,xof,\ diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx index 5930d12357..442ad50b00 100755 --- a/xmloff/source/forms/property_meta_data.cxx +++ b/xmloff/source/forms/property_meta_data.cxx @@ -35,7 +35,7 @@ #include <tools/diagnose_ex.h> #include <tools/debug.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> //...................................................................................................................... namespace xmloff { namespace metadata @@ -83,7 +83,7 @@ namespace xmloff { namespace metadata // for some attribute or property, and otherwise delegate to the next instance. //.............................................................................................................. - typedef ::std::hash_map< ::rtl::OUString, const PropertyDescription*, ::rtl::OUStringHash > DescriptionsByName; + typedef ::boost::unordered_map< ::rtl::OUString, const PropertyDescription*, ::rtl::OUStringHash > DescriptionsByName; //.............................................................................................................. const DescriptionsByName& lcl_getPropertyDescriptions() @@ -124,7 +124,7 @@ namespace xmloff { namespace metadata } //.............................................................................................................. - typedef ::std::hash_map< ::rtl::OUString, XMLTokenEnum, ::rtl::OUStringHash > ReverseTokenLookup; + typedef ::boost::unordered_map< ::rtl::OUString, XMLTokenEnum, ::rtl::OUStringHash > ReverseTokenLookup; //.............................................................................................................. const ReverseTokenLookup& getReverseTokenLookup() @@ -153,7 +153,7 @@ namespace xmloff { namespace metadata }; //.............................................................................................................. - typedef ::std::hash_multimap< AttributeDescription, PropertyGroup, AttributeHash > AttributeGroups; + typedef ::boost::unordered_multimap< AttributeDescription, PropertyGroup, AttributeHash > AttributeGroups; //.............................................................................................................. const AttributeGroups& lcl_getAttributeGroups() @@ -174,7 +174,7 @@ namespace xmloff { namespace metadata } //.............................................................................................................. - typedef ::std::hash_map< AttributeDescription, PropertyGroups, AttributeHash > AttributesWithoutGroup; + typedef ::boost::unordered_map< AttributeDescription, PropertyGroups, AttributeHash > AttributesWithoutGroup; //.............................................................................................................. const AttributesWithoutGroup& lcl_getAttributesWithoutGroups() diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index bf0d8db82b..c1b890a232 100755 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -963,7 +963,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt NfIndexTableOffset eBuiltIn = pFormatter->GetIndexTableOffset( nKey ); short nFmtType = 0; - BOOL bThousand = sal_False; + sal_Bool bThousand = sal_False; sal_uInt16 nPrecision = 0; sal_uInt16 nLeading = 0; rFormat.GetNumForInfo( nPart, nFmtType, bThousand, nPrecision, nLeading); |