[Libreoffice-commits] core.git: extensions/source
Sven Wehner
wehner at informatik.uni-freiburg.de
Thu Jan 30 03:35:58 PST 2014
extensions/source/bibliography/bibbeam.cxx | 34 +++++-----------------------
extensions/source/bibliography/framectr.cxx | 19 +++++++--------
extensions/source/bibliography/general.cxx | 13 ++++------
3 files changed, 22 insertions(+), 44 deletions(-)
New commits:
commit 2c932dcd77a287ea882dec8e3741699065f183e3
Author: Sven Wehner <wehner at informatik.uni-freiburg.de>
Date: Tue Jan 28 18:14:29 2014 +0100
fdo#39468 Translate German comments
Also remove ASCII art, and fix minor typos.
Note: I left the unknown word "Stati" as is.
This could be an incorrect plural for "status".
Change-Id: Ic19407c0ebb3aba3ebba4940b2511ba5b8dc825e
Reviewed-on: https://gerrit.libreoffice.org/7716
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index c4619f5..e3a86ed 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -42,10 +42,8 @@ using namespace ::com::sun::star::uno;
#define ID_TOOLBAR 1
#define ID_GRIDWIN 2
-//.........................................................................
namespace bib
{
-//.........................................................................
using namespace ::com::sun::star::uno;
@@ -69,9 +67,7 @@ namespace bib
}
}
- //=====================================================================
- //= BibGridwin
- //=====================================================================
+
class BibGridwin
:public Window //DockingWindow
{
@@ -80,7 +76,7 @@ namespace bib
Reference< awt::XControlModel > m_xGridModel;
Reference< awt::XControl > m_xControl;
Reference< awt::XControlContainer > m_xControlContainer;
- // #100312# ---------
+ // #100312#
Reference< frame::XDispatchProviderInterception> m_xDispatchProviderInterception;
protected:
@@ -96,13 +92,12 @@ namespace bib
void disposeGridWin();
const Reference< awt::XControlContainer >& getControlContainer() const { return m_xControlContainer; }
- // #100312# ---------
+ // #100312#
const Reference< frame::XDispatchProviderInterception>& getDispatchProviderInterception() const { return m_xDispatchProviderInterception; }
virtual void GetFocus();
};
- //---------------------------------------------------------------------
BibGridwin::BibGridwin( Window* _pParent, WinBits _nStyle ) : Window( _pParent, _nStyle )
{
m_xControlContainer = VCLUnoHelper::CreateControlContainer(this);
@@ -110,7 +105,6 @@ namespace bib
AddToTaskPaneList( this );
}
- //---------------------------------------------------------------------
BibGridwin::~BibGridwin()
{
RemoveFromTaskPaneList( this );
@@ -118,7 +112,6 @@ namespace bib
disposeGridWin();
}
- //---------------------------------------------------------------------
void BibGridwin::Resize()
{
if(m_xGridWin.is())
@@ -128,7 +121,6 @@ namespace bib
}
}
- //---------------------------------------------------------------------
void BibGridwin::createGridWin(const uno::Reference< awt::XControlModel > & xGModel)
{
m_xGridModel = xGModel;
@@ -153,14 +145,14 @@ namespace bib
if ( m_xControl.is() )
{
- // Peer als Child zu dem FrameWindow
+ // Peer as Child to the FrameWindow
m_xControlContainer->addControl("GridControl", m_xControl);
m_xGridWin=uno::Reference< awt::XWindow > (m_xControl, UNO_QUERY );
- // #100312# -----
+ // #100312#
m_xDispatchProviderInterception=uno::Reference< frame::XDispatchProviderInterception > (m_xControl, UNO_QUERY );
m_xGridWin->setVisible( sal_True );
m_xControl->setDesignMode( sal_True );
- // initially switch on the desing mode - switch it off _after_ loading the form
+ // initially switch on the design mode - switch it off _after_ loading the form
::Size aSize = GetOutputSizePixel();
m_xGridWin->setPosSize(0, 0, aSize.Width(),aSize.Height(), awt::PosSize::POSSIZE);
@@ -169,7 +161,6 @@ namespace bib
}
}
- //---------------------------------------------------------------------
void BibGridwin::disposeGridWin()
{
if ( m_xControl.is() )
@@ -183,14 +174,12 @@ namespace bib
}
}
- //---------------------------------------------------------------------
void BibGridwin::GetFocus()
{
if(m_xGridWin.is())
m_xGridWin->setFocus();
}
- //---------------------------------------------------------------------
BibBeamer::BibBeamer( Window* _pParent, BibDataManager* _pDM, WinBits _nStyle )
:BibSplitWindow( _pParent, _nStyle | WB_NOSPLITDRAW )
,pDatMan( _pDM )
@@ -204,7 +193,6 @@ namespace bib
connectForm( pDatMan );
}
- //---------------------------------------------------------------------
BibBeamer::~BibBeamer()
{
if ( isFormConnected() )
@@ -230,7 +218,6 @@ namespace bib
}
- //---------------------------------------------------------------------
void BibBeamer::createToolBar()
{
pToolBar= new BibToolBar(this, LINK( this, BibBeamer, RecalcLayout_Impl ));
@@ -240,7 +227,6 @@ namespace bib
pToolBar->SetXController( m_xController );
}
- //---------------------------------------------------------------------
void BibBeamer::createGridWin()
{
pGridWin = new BibGridwin(this,0);
@@ -250,7 +236,6 @@ namespace bib
pGridWin->createGridWin( pDatMan->updateGridModel() );
}
- //---------------------------------------------------------------------
Reference< awt::XControlContainer > BibBeamer::getControlContainer()
{
Reference< awt::XControlContainer > xReturn;
@@ -259,7 +244,7 @@ namespace bib
return xReturn;
}
- // #100312# -----------------------------------------------------------
+ // #100312#
Reference< frame::XDispatchProviderInterception > BibBeamer::getDispatchProviderInterception()
{
Reference< frame::XDispatchProviderInterception > xReturn;
@@ -268,7 +253,6 @@ namespace bib
return xReturn;
}
- //---------------------------------------------------------------------
void BibBeamer::SetXController(const uno::Reference< frame::XController > & xCtr)
{
m_xController = xCtr;
@@ -278,14 +262,12 @@ namespace bib
}
- //---------------------------------------------------------------------
void BibBeamer::GetFocus()
{
if( pGridWin )
pGridWin->GrabFocus();
}
- //---------------------------------------------------------------------
IMPL_LINK( BibBeamer, RecalcLayout_Impl, void*, /*pVoid*/ )
{
long nHeight = pToolBar->GetSizePixel().Height();
@@ -293,8 +275,6 @@ namespace bib
return 0L;
}
-//.........................................................................
} // namespace bib
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 768ac82..dea99c3 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -557,7 +557,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
{
sal_uInt32 nCount = 0;
xSet->getPropertyValue("RowCount") >>= nCount;
- // naechste position festellen
+ // determine next position
sal_Bool bSuccess = sal_False;
sal_Bool bLeft = sal_False;
sal_Bool bRight = sal_False;
@@ -577,7 +577,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
bSuccess = xConfirm->confirmDelete(aEvent);
}
- // das Ding loeschen
+ // delete it
if (bSuccess)
xUpdateCursor->deleteRow();
}
@@ -592,18 +592,18 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
else
{
sal_Bool bCanInsert = canInsertRecords(xSet);
- // kann noch ein Datensatz eingefuegt weden
+ // can another entry be inserted?
try
{
if (bCanInsert)
xUpdateCursor->moveToInsertRow();
else
- // Datensatz bewegen um Stati neu zu setzen
+ // move data entry to reset Stati
xCursor->first();
}
catch(const Exception&)
{
- OSL_FAIL("DeleteRecord : exception caught !");
+ OSL_FAIL("DeleteRecord: exception caught!");
}
}
}
@@ -644,7 +644,6 @@ IMPL_STATIC_LINK( BibFrameController_Impl, DisposeHdl, void*, EMPTYARG )
return 0;
};
-//-----------------------------------------------------------------------------
void BibFrameController_Impl::addStatusListener(
const uno::Reference< frame::XStatusListener > & aListener,
const util::URL& aURL)
@@ -654,7 +653,7 @@ void BibFrameController_Impl::addStatusListener(
// create a new Reference and insert into listener array
aStatusListeners.push_back( new BibStatusDispatch( aURL, aListener ) );
- // den ersten Status synchron zusenden
+ // send first status synchronously
FeatureStateEvent aEvent;
aEvent.FeatureURL = aURL;
aEvent.Requery = sal_False;
@@ -777,7 +776,7 @@ void BibFrameController_Impl::addStatusListener(
}
aListener->statusChanged( aEvent );
}
-//-----------------------------------------------------------------------------
+
void BibFrameController_Impl::removeStatusListener(
const uno::Reference< frame::XStatusListener > & aObject, const util::URL& aURL)
throw (::com::sun::star::uno::RuntimeException)
@@ -800,7 +799,7 @@ void BibFrameController_Impl::removeStatusListener(
}
}
}
-//-----------------------------------------------------------------------------
+
void BibFrameController_Impl::RemoveFilter()
{
OUString aQuery;
@@ -841,7 +840,7 @@ void BibFrameController_Impl::RemoveFilter()
}
}
-//-----------------------------------------------------------------------------
+
void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::PropertyValue >& aArgs)
{
const beans::PropertyValue* pPropertyValue = aArgs.getConstArray();
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 74a0b03..1387502 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -62,7 +62,6 @@ static ::Point lcl_MovePoint(const FixedText& rFixedText)
return aRet;
}
-//-----------------------------------------------------------------------------
static OUString lcl_GetColumnName( const Mapping* pMapping, sal_uInt16 nIndexPos )
{
BibConfig* pBibConfig = BibModul::GetConfig();
@@ -394,7 +393,7 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
if(!sTableErrorString.isEmpty())
sTableErrorString = sErrorPrefix + sTableErrorString;
}
-//-----------------------------------------------------------------------------
+
BibGeneralPage::~BibGeneralPage()
{
if (pDatMan && xPosListener.is())
@@ -430,7 +429,7 @@ void BibGeneralPage::CommitActiveControl()
xBound->commit();
}
}
-//-----------------------------------------------------------------------------
+
void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::Point& rPos, const ::Size& rSize,
OUString& rErrorString, OUString aColumnUIName, const OString& sHelpId, sal_uInt16 nIndexInFTArray )
{
@@ -453,7 +452,7 @@ void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::P
rErrorString += MnemonicGenerator::EraseAllMnemonicChars( aColumnUIName );
}
}
-//-----------------------------------------------------------------------------
+
uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl(
const OUString& rName,
::Point rPos, ::Size rSize, const OString& sHelpId, sal_Int16& rIndex )
@@ -528,7 +527,7 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl(
{
xControl->setModel( xCtrModel);
- // Peer als Child zu dem FrameWindow
+ // Peer as Child to the FrameWindow
xCtrlContnr->addControl(rName, xControl);
uno::Reference< awt::XWindow > xCtrWin(xControl, UNO_QUERY );
xCtrWin->addFocusListener( this );
@@ -542,7 +541,7 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl(
}
xCtrWin->setVisible( sal_True );
xControl->setDesignMode( sal_True );
- // initially switch on the desing mode - switch it off _after_ loading the form
+ // initially switch on the design mode - switch it off _after_ loading the form
xCtrWin->setPosSize(rPos.X(), rPos.Y(), rSize.Width(),
rSize.Height(), awt::PosSize::POSSIZE);
@@ -553,7 +552,7 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl(
catch(Exception& rEx)
{
(void) rEx; // make compiler happy
- OSL_FAIL("BibGeneralPage::AddXControl: something went wrong !");
+ OSL_FAIL("BibGeneralPage::AddXControl: something went wrong!");
}
return xCtrModel;
}
More information about the Libreoffice-commits
mailing list