[Libreoffice-commits] core.git: 3 commits - chart2/source forms/source fpicker/source framework/inc framework/source qadevOOo/tests sfx2/inc sfx2/source vcl/source
Tor Lillqvist
tml at iki.fi
Mon Mar 25 14:59:04 PDT 2013
chart2/source/controller/main/ChartController.cxx | 4 -
chart2/source/controller/main/ChartController.hxx | 2
forms/source/xforms/datatypes.cxx | 3 -
fpicker/source/office/iodlg.cxx | 28 +++++-----
fpicker/source/office/iodlg.hxx | 2
framework/inc/services/frame.hxx | 2
framework/source/inc/pattern/frame.hxx | 6 +-
framework/source/jobs/job.cxx | 2
framework/source/services/frame.cxx | 10 +--
qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java | 2
sfx2/inc/sfx2/viewsh.hxx | 4 -
sfx2/source/view/sfxbasecontroller.cxx | 6 +-
sfx2/source/view/viewsh.cxx | 8 +-
vcl/source/gdi/graphictools.cxx | 2
14 files changed, 40 insertions(+), 41 deletions(-)
New commits:
commit 8ffe4af627d526131a3f06c54c3410b66f0c0f2b
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Mar 25 23:57:37 2013 +0200
Fix error: use of undeclared identifier 'stderr'
Change-Id: Ie21b40f79882bdcf93e67b83dd8e97e72b69ea00
diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx
index da1cbac..d68bc8b 100644
--- a/vcl/source/gdi/graphictools.cxx
+++ b/vcl/source/gdi/graphictools.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <stdio.h>
+
#include <tools/vcompat.hxx>
#include <vcl/graphictools.hxx>
commit 2413a8edc286982a39af8d482d6de709de79c14d
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Mar 25 23:14:25 2013 +0200
Fix warning: unused variable 'sConverted' [loplugin]
Change-Id: I14a2d98c519b2eab6645eaf8b2dcdbccc7c36c2f
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index 94f6fa8..3b9f041 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -227,9 +227,6 @@ namespace xforms
//--------------------------------------------------------------------
sal_uInt16 OXSDDataType::_validate( const ::rtl::OUString& _rValue )
{
- // care for the whitespaces
- ::rtl::OUString sConverted = Convert::convertWhitespace( _rValue, m_nWST );
-
// care for the regular expression
if ( !m_sPattern.isEmpty() )
{
commit 07b5102e7b1423becc395660c9f5c02bfab6477a
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Mar 25 23:03:49 2013 +0200
There are many ships in the port of Hamburg but "ownership" is not one
Change-Id: I971390d084b08293b21fdc35beb74482a1560bb8
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 4fe20ec..02f071d 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -165,7 +165,7 @@ ChartController::TheModel::~TheModel()
{
}
-void ChartController::TheModel::SetOwnerShip( sal_Bool bGetsOwnership )
+void ChartController::TheModel::SetOwnership( sal_Bool bGetsOwnership )
{
m_bOwnership = bGetsOwnership;
m_bOwnershipIsWellKnown = sal_True;
@@ -873,7 +873,7 @@ void ChartController::impl_deleteDrawViewController()
{
if( bGetsOwnership )
{
- aModelRef->SetOwnerShip( bGetsOwnership );
+ aModelRef->SetOwnership( bGetsOwnership );
}
throw util::CloseVetoException();
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index b6d1cf2..21bad8f 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -506,7 +506,7 @@ private:
virtual ~TheModel();
- void SetOwnerShip( sal_Bool bGetsOwnership );
+ void SetOwnership( sal_Bool bGetsOwnership );
void addListener( ChartController* pController );
void removeListener( ChartController* pController );
void tryTermination();
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 51b05ec..2009c23 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -343,7 +343,7 @@ struct ControlChain_Impl
{
Window* _pControl;
ControlChain_Impl* _pNext;
- sal_Bool _bHasOwnerShip;
+ sal_Bool _bHasOwnership;
ControlChain_Impl( Window* pControl, ControlChain_Impl* pNext );
~ControlChain_Impl();
@@ -358,7 +358,7 @@ ControlChain_Impl::ControlChain_Impl
)
: _pControl( pControl ),
_pNext( pNext ),
- _bHasOwnerShip( sal_True )
+ _bHasOwnership( sal_True )
{
}
@@ -366,7 +366,7 @@ ControlChain_Impl::ControlChain_Impl
ControlChain_Impl::~ControlChain_Impl()
{
- if ( _bHasOwnerShip )
+ if ( _bHasOwnership )
{
delete _pControl;
}
@@ -630,7 +630,7 @@ void SvtFileDialog::Init_Impl
_pCbReadOnly->SetHelpId( HID_FILEOPEN_READONLY );
_pCbReadOnly->SetText( SvtResId( STR_SVT_FILEPICKER_READONLY ) );
AddControl( _pCbReadOnly );
- ReleaseOwnerShip( _pCbReadOnly );
+ ReleaseOwnership( _pCbReadOnly );
_pCbReadOnly->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) );
}
@@ -639,7 +639,7 @@ void SvtFileDialog::Init_Impl
_pImp->_pCbPassword = new CheckBox( this, SvtResId( CB_EXPLORERFILE_PASSWORD ) );
_pImp->_pCbPassword->SetText( SvtResId( STR_SVT_FILEPICKER_PASSWORD ) );
AddControl( _pImp->_pCbPassword );
- ReleaseOwnerShip( _pImp->_pCbPassword );
+ ReleaseOwnership( _pImp->_pCbPassword );
_pImp->_pCbPassword->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) );
}
@@ -2901,7 +2901,7 @@ void SvtFileDialog::AddControls_Impl( )
_pCbLinkBox ->SetText( SvtResId( STR_SVT_FILEPICKER_INSERT_AS_LINK ) );
_pCbLinkBox ->SetHelpId( HID_FILEDLG_LINK_CB );
AddControl( _pCbLinkBox );
- ReleaseOwnerShip( _pCbLinkBox );
+ ReleaseOwnership( _pCbLinkBox );
_pCbLinkBox->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) );
}
@@ -2918,13 +2918,13 @@ void SvtFileDialog::AddControls_Impl( )
_pCbPreviewBox->SetText( SvtResId( STR_SVT_FILEPICKER_SHOW_PREVIEW ) );
_pCbPreviewBox->SetHelpId( HID_FILEDLG_PREVIEW_CB );
AddControl( _pCbPreviewBox );
- ReleaseOwnerShip( _pCbPreviewBox );
+ ReleaseOwnership( _pCbPreviewBox );
_pCbPreviewBox->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) );
// generate preview window just here
_pPrevWin = new Window( this, WinBits( WB_BORDER ) );
AddControl( _pPrevWin );
- ReleaseOwnerShip( _pPrevWin );
+ ReleaseOwnership( _pPrevWin );
_pPrevWin->Hide();
_pPrevBmp = new FixedBitmap( this, WinBits( WB_BORDER ) );
@@ -2939,7 +2939,7 @@ void SvtFileDialog::AddControls_Impl( )
_pImp->_pCbAutoExtension->SetText( SvtResId( STR_SVT_FILEPICKER_AUTO_EXTENSION ) );
_pImp->_pCbAutoExtension->Check( sal_True );
AddControl( _pImp->_pCbAutoExtension );
- ReleaseOwnerShip( _pImp->_pCbAutoExtension );
+ ReleaseOwnership( _pImp->_pCbAutoExtension );
_pImp->_pCbAutoExtension->SetClickHdl( LINK( this, SvtFileDialog, AutoExtensionHdl_Impl ) );
}
@@ -2948,7 +2948,7 @@ void SvtFileDialog::AddControls_Impl( )
_pImp->_pCbOptions = new CheckBox( this, SvtResId( CB_OPTIONS ) );
_pImp->_pCbOptions->SetText( SvtResId( STR_SVT_FILEPICKER_FILTER_OPTIONS ) );
AddControl( _pImp->_pCbOptions );
- ReleaseOwnerShip( _pImp->_pCbOptions );
+ ReleaseOwnership( _pImp->_pCbOptions );
_pImp->_pCbOptions->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) );
}
@@ -2957,7 +2957,7 @@ void SvtFileDialog::AddControls_Impl( )
_pCbSelection = new CheckBox( this, SvtResId( CB_OPTIONS ) );
_pCbSelection->SetText( SvtResId( STR_SVT_FILEPICKER_SELECTION ) );
AddControl( _pCbSelection );
- ReleaseOwnerShip( _pCbSelection );
+ ReleaseOwnership( _pCbSelection );
_pCbSelection->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) );
}
@@ -2967,7 +2967,7 @@ void SvtFileDialog::AddControls_Impl( )
_pPbPlay->SetText( SvtResId( STR_SVT_FILEPICKER_PLAY ) );
_pPbPlay->SetHelpId( HID_FILESAVE_DOPLAY );
AddControl( _pPbPlay );
- ReleaseOwnerShip( _pPbPlay );
+ ReleaseOwnership( _pPbPlay );
_pPbPlay->SetClickHdl( LINK( this, SvtFileDialog, PlayButtonHdl_Impl ) );
}
@@ -3112,7 +3112,7 @@ sal_Bool SvtFileDialog::getShowState()
}
// -----------------------------------------------------------------------
-void SvtFileDialog::ReleaseOwnerShip( Window* pUserControl )
+void SvtFileDialog::ReleaseOwnership( Window* pUserControl )
/*
[Description]
@@ -3126,7 +3126,7 @@ void SvtFileDialog::ReleaseOwnerShip( Window* pUserControl )
{
if ( pElement->_pControl == pUserControl )
{
- pElement->_bHasOwnerShip = sal_False;
+ pElement->_bHasOwnership = sal_False;
break;
}
pElement = pElement->_pNext;
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index f74734c..21a2afd 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -179,7 +179,7 @@ protected:
String _aPath;
String _aDefExt;
- void ReleaseOwnerShip( Window* pUserControl );
+ void ReleaseOwnership( Window* pUserControl );
/** enables or disables the complete UI of the file picker, with only offering a
cancel button
diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx
index e5da725..2dadf91 100644
--- a/framework/inc/services/frame.hxx
+++ b/framework/inc/services/frame.hxx
@@ -269,7 +269,7 @@ class Frame : // interfaces
//---------------------------------------------------------------------------------------------------------
// XCloseable
//---------------------------------------------------------------------------------------------------------
- virtual void SAL_CALL close( sal_Bool bDeliverOwnerShip ) throw( css::util::CloseVetoException,
+ virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException,
css::uno::RuntimeException );
//---------------------------------------------------------------------------------------------------------
diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx
index 6bb2b8e..ac99882 100644
--- a/framework/source/inc/pattern/frame.hxx
+++ b/framework/source/inc/pattern/frame.hxx
@@ -64,7 +64,7 @@ inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::un
@param xResource
the object, which should be closed here.
- @param bDelegateOwnerShip
+ @param bDelegateOwnership
used at the XCloseable->close() method to define
the right owner in case closing failed.
@@ -72,7 +72,7 @@ inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::un
sal_True if closing failed.
*/
inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xResource ,
- sal_Bool bDelegateOwnerShip)
+ sal_Bool bDelegateOwnership)
{
css::uno::Reference< css::util::XCloseable > xClose (xResource, css::uno::UNO_QUERY);
css::uno::Reference< css::lang::XComponent > xDispose(xResource, css::uno::UNO_QUERY);
@@ -80,7 +80,7 @@ inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xReso
try
{
if (xClose.is())
- xClose->close(bDelegateOwnerShip);
+ xClose->close(bDelegateOwnership);
else
if (xDispose.is())
xDispose->dispose();
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 1b071b6..385b2bf 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -781,7 +781,7 @@ void SAL_CALL Job::notifyTermination( /*IN*/ const css::lang::EventObject& ) thr
@param aEvent
describes the broadcaster and must be the frame instance
- @param bGetsOwnerShip
+ @param bGetsOwnership
If it's set to <sal_True> and we throw the right veto excepion, we have to close this frame later
if our internal processes will be finished. If it's set to <FALSE/> we can ignore it.
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 8750e40..e33e93d 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -1546,11 +1546,11 @@ void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::
@descr This method ask internal component (controller) if he accept this close request.
In case of <TRUE/> nothing will be happen (from point of caller of this close method).
In case of <FALSE/> a CloseVetoException is thrown. After such exception given parameter
- <var>bDeliverOwnerShip</var> regulate which will be the new owner of this instance.
+ <var>bDeliverOwnership</var> regulate which will be the new owner of this instance.
@attention It's the replacement for XTask::close() which is marked as obsolete method.
- @param bDeliverOwnerShip
+ @param bDeliverOwnership
If parameter is set to <FALSE/> the original caller will be the owner after thrown
veto exception and must try to close this frame at later time again. Otherwhise the
source of throwed exception is the right one. May it will be the frame himself.
@@ -1560,7 +1560,7 @@ void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::
@threadsafe yes
*//*-*****************************************************************************************************/
-void SAL_CALL Frame::close( sal_Bool bDeliverOwnerShip ) throw( css::util::CloseVetoException,
+void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException,
css::uno::RuntimeException )
{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
@@ -1583,7 +1583,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnerShip ) throw( css::util::Close
{
try
{
- ((css::util::XCloseListener*)pIterator.next())->queryClosing( aSource, bDeliverOwnerShip );
+ ((css::util::XCloseListener*)pIterator.next())->queryClosing( aSource, bDeliverOwnership );
}
catch( const css::uno::RuntimeException& )
{
@@ -1596,7 +1596,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnerShip ) throw( css::util::Close
// check if this frame is used for any load process currently
if (isActionLocked())
{
- if (bDeliverOwnerShip)
+ if (bDeliverOwnership)
{
/* SAFE */
WriteGuard aWriteLock( m_aLock );
diff --git a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java
index 5620977..ef9b175 100644
--- a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java
+++ b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java
@@ -107,7 +107,7 @@ public class _XClipboard extends MultiMethodTest {
/**
* Sets new contents for the clipboard. Then checks if it was set,
- * and if <code>lostOwnerShip()</code> notification of the prevoius
+ * and if <code>lostOwnership()</code> notification of the prevoius
* contents was called with appropriate parameters.<p>
* Has <b> OK </b> status if <code>getContents</code> returns the same
* object which is set, and notification was received.
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index fc78940..5eea56a 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -291,8 +291,8 @@ public:
SAL_DLLPRIVATE void CheckIPClient_Impl( SfxInPlaceClient*, const Rectangle& );
SAL_DLLPRIVATE void PushSubShells_Impl( sal_Bool bPush=sal_True );
SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( sal_False ); }
- SAL_DLLPRIVATE void TakeOwnerShip_Impl();
- SAL_DLLPRIVATE void TakeFrameOwnerShip_Impl();
+ SAL_DLLPRIVATE void TakeOwnership_Impl();
+ SAL_DLLPRIVATE void TakeFrameOwnership_Impl();
SAL_DLLPRIVATE sal_Bool ExecKey_Impl(const KeyEvent& aKey);
};
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 260f6b3..4614bb2 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -379,12 +379,12 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const EV
{
if ( bDeliverOwnership && ( !pShell->GetWindow() || !pShell->GetWindow()->IsReallyVisible() ) )
{
- // ignore OwnerShip in case of visible frame (will be closed by user)
+ // ignore Ownership in case of visible frame (will be closed by user)
uno::Reference < frame::XModel > xModel( aEvent.Source, uno::UNO_QUERY );
if ( xModel.is() )
- pShell->TakeOwnerShip_Impl();
+ pShell->TakeOwnership_Impl();
else
- pShell->TakeFrameOwnerShip_Impl();
+ pShell->TakeFrameOwnership_Impl();
}
throw com::sun::star::util::CloseVetoException(::rtl::OUString("Controller disagree ..."),static_cast< ::cppu::OWeakObject*>(this));
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index de6b6d3..57ab107 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -2039,16 +2039,16 @@ sal_Bool SfxViewShell::TryContextMenuInterception( Menu& rIn, const ::rtl::OUStr
return sal_True;
}
-void SfxViewShell::TakeOwnerShip_Impl()
+void SfxViewShell::TakeOwnership_Impl()
{
- // currently there is only one reason to take OwnerShip: a hidden frame is printed
+ // currently there is only one reason to take Ownership: a hidden frame is printed
// so the ViewShell will check this on EndPrint (->prnmon.cxx)
pImp->m_bGotOwnership = true;
}
-void SfxViewShell::TakeFrameOwnerShip_Impl()
+void SfxViewShell::TakeFrameOwnership_Impl()
{
- // currently there is only one reason to take OwnerShip: a hidden frame is printed
+ // currently there is only one reason to take Ownership: a hidden frame is printed
// so the ViewShell will check this on EndPrint (->prnmon.cxx)
pImp->m_bGotFrameOwnership = true;
}
More information about the Libreoffice-commits
mailing list