strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

actualizacion automatica 2024-10-28

Browse source
This commit is contained in:
Artukryp 2024-10-28 12:39:30 -06:00
commit e45f68c3b3
872 changed files with 7109 additions and 25621 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Repository.mk
View file

@ -809,7 +809,6 @@ $(eval $(call gb_Helper_register_jars_for_install,URE,ure, \
$(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \
ScriptFramework \
ScriptProviderForJava \
XMergeBridge \
commonwizards \
form \
$(if $(filter-out MACOSX,$(OS)),officebean) \
@ -819,7 +818,6 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \
smoketest \
table \
unoil \
xmerge \
))
$(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder, \

1
RepositoryModule_host.mk
View file

@ -188,7 +188,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
vcl \
wizards \
writerperfect \
xmerge \
$(call gb_Helper_optional,XMLHELP,xmlhelp) \
xmloff \
xmlreader \

31
accessibility/source/extended/AccessibleBrowseBox.cxx
View file

@ -134,27 +134,24 @@ AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint )
SolarMethodGuard aGuard(getMutex());
ensureIsAlive();
css::uno::Reference< css::accessibility::XAccessible > xChild;
sal_Int32 nIndex = 0;
if (mpBrowseBox->ConvertPointToControlIndex(nIndex, VCLUnoHelper::ConvertToVCLPoint(rPoint)))
xChild = mpBrowseBox->CreateAccessibleControl( nIndex );
else
{
// try whether point is in one of the fixed children
// (table, header bars, corner control)
Point aPoint(VCLUnoHelper::ConvertToVCLPoint(rPoint));
for( nIndex = 0; (nIndex < vcl::BBINDEX_FIRSTCONTROL) && !xChild.is(); ++nIndex )
{
css::uno::Reference< css::accessibility::XAccessible > xCurrChild( implGetFixedChild( nIndex ) );
css::uno::Reference< css::accessibility::XAccessibleComponent >
xCurrChildComp( xCurrChild, uno::UNO_QUERY );
return mpBrowseBox->CreateAccessibleControl(nIndex);
if (xCurrChildComp.is()
&& VCLUnoHelper::ConvertToVCLRect(xCurrChildComp->getBounds()).Contains(aPoint))
xChild = xCurrChild;
}
// try whether point is in one of the fixed children
// (table, header bars, corner control)
Point aPoint(VCLUnoHelper::ConvertToVCLPoint(rPoint));
for (nIndex = 0; nIndex < vcl::BBINDEX_FIRSTCONTROL; ++nIndex)
{
css::uno::Reference< css::accessibility::XAccessible > xCurrChild(implGetFixedChild(nIndex));
css::uno::Reference< css::accessibility::XAccessibleComponent >
xCurrChildComp( xCurrChild, uno::UNO_QUERY );
if (xCurrChildComp.is()
&& VCLUnoHelper::ConvertToVCLRect(xCurrChildComp->getBounds()).Contains(aPoint))
return xCurrChild;
}
return xChild;
return nullptr;
}

9
accessibility/source/extended/AccessibleGridControl.cxx
View file

@ -146,16 +146,15 @@ AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint )
SolarMutexGuard aSolarGuard;
ensureIsAlive();
css::uno::Reference< css::accessibility::XAccessible > xChild;
sal_Int32 nIndex = 0;
if (m_aTable.ConvertPointToControlIndex(nIndex, VCLUnoHelper::ConvertToVCLPoint(rPoint)))
xChild = m_aTable.CreateAccessibleControl( nIndex );
return m_aTable.CreateAccessibleControl(nIndex);
else
{
// try whether point is in one of the fixed children
// (table, header bars, corner control)
Point aPoint(VCLUnoHelper::ConvertToVCLPoint(rPoint));
for( nIndex = 0; (nIndex < 3) && !xChild.is(); ++nIndex )
for (nIndex = 0; nIndex < 3; ++nIndex)
{
css::uno::Reference< css::accessibility::XAccessible > xCurrChild( implGetFixedChild( nIndex ) );
css::uno::Reference< css::accessibility::XAccessibleComponent >
@ -163,10 +162,10 @@ AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint )
if (xCurrChildComp.is()
&& VCLUnoHelper::ConvertToVCLRect(xCurrChildComp->getBounds()).Contains(aPoint))
xChild = xCurrChild;
return xCurrChild;
}
}
return xChild;
return nullptr;
}

10
accessibility/source/extended/accessibletabbar.cxx
View file

@ -349,15 +349,11 @@ namespace accessibility
return Application::GetSettings().GetLanguageTag().getLocale();
}
// XAccessibleComponent
Reference< XAccessible > AccessibleTabBar::getAccessibleAtPoint( const awt::Point& rPoint )
{
OExternalLockGuard aGuard( this );
Reference< XAccessible > xChild;
for( sal_Int64 i = 0; i < getAccessibleChildCount(); ++i )
{
Reference< XAccessible > xAcc = getAccessibleChild( i );
@ -370,17 +366,15 @@ namespace accessibility
Point aPos = VCLUnoHelper::ConvertToVCLPoint(rPoint);
if ( aRect.Contains( aPos ) )
{
xChild = xAcc;
break;
return xAcc;
}
}
}
}
return xChild;
return nullptr;
}
void AccessibleTabBar::grabFocus( )
{
OExternalLockGuard aGuard( this );

8
accessibility/source/extended/textwindowaccessibility.cxx
View file

@ -1004,15 +1004,15 @@ Document::retrieveCharacterAttributes(
// sort the attributes
auto nLength = static_cast<size_t>(aRes.getLength());
std::unique_ptr<sal_Int32[]> pIndices( new sal_Int32[nLength] );
std::iota(&pIndices[0], &pIndices[nLength], 0);
std::sort(&pIndices[0], &pIndices[nLength],
std::vector<sal_Int32> pIndices(nLength);
std::iota(pIndices.begin(), pIndices.end(), 0);
std::sort(pIndices.begin(), pIndices.end(),
[&aRes](sal_Int32 a, sal_Int32 b) { return aRes[a].Name < aRes[b].Name; });
// create sorted sequences according to index array
std::vector<css::beans::PropertyValue> aNewValues;
aNewValues.reserve(nLength);
std::transform(&pIndices[0], &pIndices[nLength], std::back_inserter(aNewValues),
std::transform(pIndices.begin(), pIndices.end(), std::back_inserter(aNewValues),
[&aRes](const sal_Int32 nIdx) -> const css::beans::PropertyValue& { return aRes[nIdx]; });
return comphelper::containerToSequence(aNewValues);

24
accessibility/source/helper/acc_factory.cxx
View file

@ -303,8 +303,6 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLX
Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXWindow* _pXWindow )
{
Reference< XAccessibleContext > xContext;
VclPtr<vcl::Window> pWindow = _pXWindow->GetWindow();
if ( pWindow )
{
@ -315,50 +313,50 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLX
Reference< XAccessible > xAcc( pWindow->GetAccessible() );
if ( xAcc.is() )
{
Reference< XAccessibleContext > xCont( xAcc->getAccessibleContext() );
Reference<XAccessibleContext > xContext(xAcc->getAccessibleContext());
if ( pWindow->GetType() == WindowType::MENUBARWINDOW ||
( xCont.is() && xCont->getAccessibleRole() == AccessibleRole::POPUP_MENU ) )
( xContext.is() && xContext->getAccessibleRole() == AccessibleRole::POPUP_MENU ) )
{
xContext = xCont;
return xContext;
}
}
}
else if ( nType == WindowType::STATUSBAR )
{
xContext = new VCLXAccessibleStatusBar(_pXWindow);
return new VCLXAccessibleStatusBar(_pXWindow);
}
else if ( nType == WindowType::TABCONTROL )
{
xContext = new VCLXAccessibleTabControl(_pXWindow);
return new VCLXAccessibleTabControl(_pXWindow);
}
else if ( nType == WindowType::TABPAGE && pWindow->GetAccessibleParentWindow() && pWindow->GetAccessibleParentWindow()->GetType() == WindowType::TABCONTROL )
{
xContext = new VCLXAccessibleTabPageWindow( _pXWindow );
return new VCLXAccessibleTabPageWindow(_pXWindow);
}
else if ( nType == WindowType::FLOATINGWINDOW )
{
xContext = new FloatingWindowAccessible( _pXWindow );
return new FloatingWindowAccessible(_pXWindow);
}
else if ( nType == WindowType::BORDERWINDOW && hasFloatingChild( pWindow ) )
{
xContext = new FloatingWindowAccessible( _pXWindow );
return new FloatingWindowAccessible(_pXWindow);
}
else if ( ( nType == WindowType::HELPTEXTWINDOW ) || ( nType == WindowType::FIXEDLINE ) )
{
xContext = new VCLXAccessibleFixedText(_pXWindow);
return new VCLXAccessibleFixedText(_pXWindow);
}
else
{
xContext = new VCLXAccessibleComponent(_pXWindow);
return new VCLXAccessibleComponent(_pXWindow);
}
}
return xContext;
return nullptr;
}
Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXToolBox* _pXWindow )

6
accessibility/source/standard/accessiblemenubasecomponent.cxx
View file

@ -334,7 +334,6 @@ Reference< XAccessible > OAccessibleMenuBaseComponent::GetChild( sal_Int64 i )
Reference< XAccessible > OAccessibleMenuBaseComponent::GetChildAt( const awt::Point& rPoint )
{
Reference< XAccessible > xChild;
for ( sal_Int64 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i )
{
Reference< XAccessible > xAcc = getAccessibleChild( i );
@ -347,14 +346,13 @@ Reference< XAccessible > OAccessibleMenuBaseComponent::GetChildAt( const awt::Po
Point aPos = VCLUnoHelper::ConvertToVCLPoint(rPoint);
if ( aRect.Contains( aPos ) )
{
xChild = xAcc;
break;
return xAcc;
}
}
}
}
return xChild;
return nullptr;
}

6
accessibility/source/standard/vclxaccessibletabpage.cxx
View file

@ -399,7 +399,6 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt:
{
OExternalLockGuard aGuard( this );
Reference< XAccessible > xChild;
for ( sal_Int64 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i )
{
Reference< XAccessible > xAcc = getAccessibleChild( i );
@ -412,14 +411,13 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt:
Point aPos = VCLUnoHelper::ConvertToVCLPoint(rPoint);
if ( aRect.Contains( aPos ) )
{
xChild = xAcc;
break;
return xAcc;
}
}
}
}
return xChild;
return nullptr;
}

19
avmedia/source/qt6/QtPlayer.cxx
View file

@ -21,8 +21,8 @@
#include <rtl/string.hxx>
#include <tools/link.hxx>
#include <vcl/BitmapTools.hxx>
#include <vcl/filter/PngImageWriter.hxx>
#include <vcl/graph.hxx>
#include <vcl/qt/QtUtils.hxx>
#include <vcl/svapp.hxx>
#include <vcl/syschild.hxx>
#include <vcl/sysdata.hxx>
@ -36,14 +36,6 @@
using namespace ::com::sun::star;
namespace
{
inline QString toQString(const OUString& rStr)
{
return QString::fromUtf16(rStr.getStr(), rStr.getLength());
}
}
namespace avmedia::qt
{
QtPlayer::QtPlayer()
@ -351,14 +343,7 @@ void QtPlayer::createMediaPlayerWidget()
}
else
{
BitmapEx aPlaceholderIcon(u"avmedia/res/avaudiologo.png"_ustr);
SvMemoryStream aMemoryStream;
vcl::PngImageWriter aWriter(aMemoryStream);
aWriter.write(aPlaceholderIcon);
QPixmap aAudioPixmap;
aAudioPixmap.loadFromData(static_cast<const uchar*>(aMemoryStream.GetData()),
aMemoryStream.TellEnd());
assert(!aAudioPixmap.isNull() && "Failed to load audio logo");
QPixmap aAudioPixmap = loadQPixmapIcon(u"avmedia/res/avaudiologo.png"_ustr);
aAudioPixmap
= aAudioPixmap.scaled(QSize(m_aPlayerWidgetRect.Width, m_aPlayerWidgetRect.Height));

7
basctl/source/accessibility/accessibledialogwindow.cxx
View file

@ -671,10 +671,7 @@ Locale AccessibleDialogWindow::getLocale( )
return Application::GetSettings().GetLanguageTag().getLocale();
}
// XAccessibleComponent
Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt::Point& rPoint )
{
OExternalLockGuard aGuard( this );
@ -692,7 +689,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt
Point aPos = VCLUnoHelper::ConvertToVCLPoint(rPoint);
if ( aRect.Contains( aPos ) )
{
xChild = xAcc;
xChild = std::move(xAcc);
break;
}
}
@ -702,7 +699,6 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt
return xChild;
}
void AccessibleDialogWindow::grabFocus( )
{
OExternalLockGuard aGuard( this );
@ -711,7 +707,6 @@ void AccessibleDialogWindow::grabFocus( )
m_pDialogWindow->GrabFocus();
}
sal_Int32 AccessibleDialogWindow::getForeground( )
{
OExternalLockGuard aGuard( this );

2
basctl/source/basicide/documentenumeration.cxx
View file

@ -117,7 +117,7 @@ namespace basctl::docs {
// create a DocumentDescriptor
DocumentDescriptor aDescriptor;
aDescriptor.xModel = xModel;
aDescriptor.xModel = std::move(xModel);
lcl_getDocumentControllers_nothrow( aDescriptor );
// consult filter, if there is one

2
basctl/source/dlged/propbrw.cxx
View file

@ -443,7 +443,7 @@ void PropBrw::ImplUpdate( const Reference< XModel >& _rxContextDocument, SdrView
if ( xContextDocument != m_xContextDocument )
{
m_xContextDocument = xContextDocument;
m_xContextDocument = std::move(xContextDocument);
ImplReCreateController();
}

2
basic/source/classes/eventatt.cxx
View file

@ -499,7 +499,7 @@ void RTL_Impl_CreateUnoDialog( SbxArray& rPar )
if ( aDlgLib.is() )
{
bDocDialog = true;
xModel = xNextModel;
xModel = std::move(xNextModel);
break;
}
}

2
basic/source/classes/sbunoobj.cxx
View file

@ -3738,7 +3738,7 @@ void SbUnoSingleton::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
Reference < XComponentContext > xFirstParamContext;
Any aArg1 = sbxToUnoValue(pParams->Get(1));
if( (aArg1 >>= xFirstParamContext) && xFirstParamContext.is() )
xContextToUse = xFirstParamContext;
xContextToUse = std::move(xFirstParamContext);
}
if( !xContextToUse.is() )

2
basic/source/runtime/runtime.cxx
View file

@ -1205,7 +1205,7 @@ void SbiRuntime::PushForEach()
else if (aAny >>= xIndexAccess)
{
p->eForType = ForType::EachXIndexAccess;
p->xIndexAccess = xIndexAccess;
p->xIndexAccess = std::move(xIndexAccess);
p->nCurCollectionIndex = 0;
}
else if ( isVBAEnabled() && pUnoObj->isNativeCOMObject() )

2
basic/source/uno/dlgcont.cxx
View file

@ -324,7 +324,7 @@ Any SfxDialogLibraryContainer::importLibraryElement
return aRetAny;
InputSource source;
source.aInputStream = xInput;
source.aInputStream = std::move(xInput);
source.sSystemId = aFile;
try {

2
basic/source/uno/namecont.cxx
View file

@ -1697,7 +1697,7 @@ bool SfxLibraryContainer::implLoadLibraryIndexFile( SfxLibrary* pLib,
}
InputSource source;
source.aInputStream = xInput;
source.aInputStream = std::move(xInput);
source.sSystemId = aLibInfoPath;
// start parsing

2
basic/source/uno/scriptcont.cxx
View file

@ -228,7 +228,7 @@ Any SfxScriptLibraryContainer::importLibraryElement
return aRetAny;
InputSource source;
source.aInputStream = xInput;
source.aInputStream = std::move(xInput);
source.sSystemId = aFile;
// start parsing

12
bin/diff-pdf-page.py
View file

@ -8,6 +8,8 @@
# red is meant to reduce as fixing progresses. Sample usage:
#
# bin/diff-pdf-page.py reference.pdf test.pdf diff.png
#
# using the ImageMagick tooling
import argparse
import tempfile
@ -26,15 +28,15 @@ def main():
parser.add_argument("diff_png")
args = parser.parse_args()
CONVERT_CMD="convert" # use "magick" if Windows has installed ImageMagick and GhostScript
a_png = tempfile.NamedTemporaryFile(suffix=".png")
a_pdf = args.a_pdf + "[" + args.page + "]"
run(["convert", "-density", args.density, a_pdf, "-colorspace", "RGB", "-fuzz", "95%", "-fill", "red", "-opaque", "black", a_png.name])
run([CONVERT_CMD, "-density", args.density, a_pdf, "-colorspace", "RGB", "-transparent", "white", "-fuzz", "95%", "-fill", "red", "-opaque", "black", a_png.name])
b_png = tempfile.NamedTemporaryFile(suffix=".png")
b_pdf = args.b_pdf + "[" + args.page + "]"
run(["convert", "-density", args.density, b_pdf, "-colorspace", "RGB", b_png.name])
composite_png = tempfile.NamedTemporaryFile(suffix=".png")
run(["convert", "-composite", a_png.name, b_png.name, composite_png.name])
run(["convert", composite_png.name, "-background", "white", "-flatten", args.diff_png])
run([CONVERT_CMD, "-density", args.density, b_pdf, "-colorspace", "RGB", "-transparent", "white", b_png.name])
run([CONVERT_CMD, a_png.name, b_png.name, "-composite", "-background", "white", "-flatten", args.diff_png])
if __name__ == "__main__":
main()

2
bin/find-unneeded-includes
View file

@ -412,7 +412,7 @@ def run_tool(task_queue, failed_files, dontstop, noexclude, checknamespaces, fin
retcode = processIWYUOutput(p.communicate()[0].decode('utf-8').splitlines(), moduleRules, invocation.split(' ')[-1], noexclude, checknamespaces, finderrors)
if finderrors:
if p.returncode == 1:
print("Running the IWYU process returned error code:\n",invocation)
print("Running the IWYU process returned error code:\n" + invocation)
if retcode == -1 and not checknamespaces:
print("ERROR: A file is probably not self contained, check this commands output:\n" + invocation)
elif retcode > 0:

1
bin/find-unusedheaders.sh
View file

@ -54,7 +54,6 @@ for subdir in $(ls -d */ | grep -v \
-e unotest/ \
-e ure/ \
-e wizards/ \
-e xmerge/ \
-e xmlreader/ \
-e instdir/ `# Skip typical build-related temporaries` \
-e workdir/ \

2
chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
View file

@ -575,7 +575,7 @@ void ChartDataWrapper::fireChartDataChangeEvent( css::chart::ChartDataChangeEven
uno::Reference< uno::XInterface > xSrc( static_cast< cppu::OWeakObject* >( this ));
OSL_ASSERT( xSrc.is());
if( xSrc.is() )
aEvent.Source = xSrc;
aEvent.Source = std::move(xSrc);
m_aEventListenerContainer.forEach( g,
[&aEvent](const uno::Reference<css::lang::XEventListener>& l)

2
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
View file

@ -545,7 +545,7 @@ bool DataPointItemConverter::ApplySpecialItem(
GetPropertySet()->getPropertyValue( u"Symbol"_ustr ) >>= aSymbol;
if( aSymbol.Graphic != xGraphic )
{
aSymbol.Graphic = xGraphic;
aSymbol.Graphic = std::move(xGraphic);
GetPropertySet()->setPropertyValue( u"Symbol"_ustr , uno::Any( aSymbol ));
bChanged = true;
}

2
chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
View file

@ -483,7 +483,7 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte
GetPropertySet()->getPropertyValue(u"Symbol"_ustr) >>= aSymbol;
if (aSymbol.Graphic != xGraphic)
{
aSymbol.Graphic = xGraphic;
aSymbol.Graphic = std::move(xGraphic);
GetPropertySet()->setPropertyValue(u"Symbol"_ustr, uno::Any(aSymbol));
bChanged = true;
}

5
chart2/source/controller/main/ChartController.cxx
View file

@ -484,10 +484,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
impl_initializeAccessible();
{
if( pChartWindow )
pChartWindow->Invalidate();
}
pChartWindow->Invalidate();
}
m_bConnectingToView = false;

18
chart2/source/controller/main/ChartController_Properties.cxx
View file

@ -102,6 +102,10 @@ wrapper::ItemConverter* createItemConverter(
//create itemconverter for a single object
switch(eObjectType)
{
case OBJECTTYPE_DATA_STOCK_LOSS:
case OBJECTTYPE_DATA_STOCK_GAIN:
case OBJECTTYPE_DIAGRAM_WALL:
case OBJECTTYPE_DIAGRAM_FLOOR:
case OBJECTTYPE_PAGE:
pItemConverter = new wrapper::GraphicPropertyItemConverter(
xObjectProperties, rDrawModel.GetItemPool(),
@ -136,13 +140,6 @@ wrapper::ItemConverter* createItemConverter(
break;
case OBJECTTYPE_DIAGRAM:
break;
case OBJECTTYPE_DIAGRAM_WALL:
case OBJECTTYPE_DIAGRAM_FLOOR:
pItemConverter = new wrapper::GraphicPropertyItemConverter(
xObjectProperties, rDrawModel.GetItemPool(),
rDrawModel, xChartModel,
wrapper::GraphicObjectType::LineAndFillProperties );
break;
case OBJECTTYPE_AXIS:
{
std::optional<awt::Size> pRefSize;
@ -283,13 +280,6 @@ wrapper::ItemConverter* createItemConverter(
}
case OBJECTTYPE_DATA_STOCK_RANGE:
break;
case OBJECTTYPE_DATA_STOCK_LOSS:
case OBJECTTYPE_DATA_STOCK_GAIN:
pItemConverter = new wrapper::GraphicPropertyItemConverter(
xObjectProperties, rDrawModel.GetItemPool(),
rDrawModel, xChartModel,
wrapper::GraphicObjectType::LineAndFillProperties );
break;
case OBJECTTYPE_DATA_TABLE:
{
pItemConverter = new wrapper::DataTableItemConverter(

2
chart2/source/controller/main/ChartController_Tools.cxx
View file

@ -425,7 +425,7 @@ void ChartController::impl_PasteShapes( SdrModel* pModel )
pDestPage->InsertObject( pNewObj.get() );
m_pDrawViewWrapper->AddUndo( std::make_unique<SdrUndoInsertObj>( *pNewObj ) );
xSelShape = xShape;
xSelShape = std::move(xShape);
}
}
}

19
chart2/source/controller/main/ChartController_Window.cxx
View file

@ -982,21 +982,15 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
{
SolarMutexGuard aGuard;
auto pChartWindow(GetChartWindow());
bool bIsAction = false;
{
DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper.get();
if(!pChartWindow || !pDrawViewWrapper)
return;
bIsAction = m_pDrawViewWrapper->IsAction();
}
DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper.get();
if(!pChartWindow || !pDrawViewWrapper)
return;
bool bIsAction = m_pDrawViewWrapper->IsAction();
// pop-up menu
if(rCEvt.GetCommand() == CommandEventId::ContextMenu && !bIsAction)
{
{
if(pChartWindow)
pChartWindow->ReleaseMouse();
}
pChartWindow->ReleaseMouse();
if( m_aSelection.isSelectionDifferentFromBeforeMouseDown() )
impl_notifySelectionChangeListeners();
@ -1006,8 +1000,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
Point aPos( rCEvt.GetMousePosPixel() );
if( !rCEvt.IsMouseEvent() )
{
if(pChartWindow)
aPos = pChartWindow->GetPointerState().maPos;
aPos = pChartWindow->GetPointerState().maPos;
}
OUString aMenuName;

4
chart2/source/controller/main/ShapeController.cxx
View file

@ -585,7 +585,7 @@ SdrObject* ShapeController::getFirstAdditionalShape()
{
if ( xShape.is() && xShape != xChartRoot )
{
xFirstShape = xShape;
xFirstShape = std::move(xShape);
break;
}
}
@ -624,7 +624,7 @@ SdrObject* ShapeController::getLastAdditionalShape()
{
if ( xShape.is() && xShape != xChartRoot )
{
xLastShape = xShape;
xLastShape = std::move(xShape);
break;
}
}

4
chart2/source/tools/LabeledDataSequence.cxx
View file

@ -70,8 +70,8 @@ LabeledDataSequence::LabeledDataSequence( const LabeledDataSequence& rSource ) :
if( xValuesCloneable.is())
xNewValues.set( xValuesCloneable->createClone(), uno::UNO_QUERY );
m_xData = xNewValues;
m_xLabel = xNewLabel;
m_xData = std::move(xNewValues);
m_xLabel = std::move(xNewLabel);
ModifyListenerHelper::addListener( m_xData, m_xModifyEventForwarder );
ModifyListenerHelper::addListener( m_xLabel, m_xModifyEventForwarder );

2
chart2/source/tools/ObjectIdentifier.cxx
View file

@ -1207,7 +1207,7 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet(
errorBar = "ErrorBarZ";
xSeries->getPropertyValue( errorBar ) >>= xErrorBarProp;
xObjectProperties = xErrorBarProp;
xObjectProperties = std::move(xErrorBarProp);
}
break;
}

4
chart2/source/tools/StatisticsHelper.cxx
View file

@ -133,7 +133,7 @@ void lcl_addSequenceToDataSource(
xDataSource->getDataSequences());
aSequences.realloc( aSequences.getLength() + 1 );
auto pSequences = aSequences.getArray();
pSequences[ aSequences.getLength() - 1 ] = xLSeq;
pSequences[ aSequences.getLength() - 1 ] = std::move(xLSeq);
xSink->setData( aSequences );
}
@ -200,7 +200,7 @@ uno::Reference< chart2::data::XLabeledDataSequence > StatisticsHelper::getErrorL
uno::Reference< chart2::data::XLabeledDataSequence > xLSeq =
lcl_getErrorBarLabeledSequence( xDataSource, bPositiveValue, bYError, aRole );
if( xLSeq.is())
xResult = xLSeq;
xResult = std::move(xLSeq);
return xResult;
}

2
chart2/source/tools/WrappedPropertySet.cxx
View file

@ -66,7 +66,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL WrappedPropertySet::getPropertySet
{
xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );
OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
m_xInfo = xInfo;
m_xInfo = std::move(xInfo);
}
}
else

88
chart2/source/view/main/DataTableView.cxx
View file

@ -330,15 +330,15 @@ void DataTableView::createShapes(basegfx::B2DVector const& rStart, basegfx::B2DV
auto xText = xCellTextRange->getText();
xText->insertString(xText->getStart(), rString, false);
auto xTextPropertySet = getFirstParagraphProperties(xText);
if (!xTextPropertySet.is())
continue;
bool bLeft
= (bOutline && nColumn == 1) || (bVBorder && nColumn > 1 && nColumn < nColumnCount);
bool bRight = (bOutline && nColumn == nColumnCount)
|| (bVBorder && nColumn > 1 && nColumn < nColumnCount);
setCellCharAndParagraphProperties(xTextPropertySet);
setCellProperties(xPropertySet, bLeft, bOutline, bRight, bOutline);
if (xTextPropertySet)
{
bool bLeft = (bOutline && nColumn == 1)
|| (bVBorder && nColumn > 1 && nColumn < nColumnCount);
bool bRight = (bOutline && nColumn == nColumnCount)
|| (bVBorder && nColumn > 1 && nColumn < nColumnCount);
setCellCharAndParagraphProperties(xTextPropertySet);
setCellProperties(xPropertySet, bLeft, bOutline, bRight, bOutline);
}
}
nColumn++;
}
@ -399,18 +399,19 @@ void DataTableView::createShapes(basegfx::B2DVector const& rStart, basegfx::B2DV
auto xText = xCellTextRange->getText();
xText->insertString(xText->getStart(), rSeriesName, false);
auto xTextPropertySet = getFirstParagraphProperties(xText);
if (!xTextPropertySet.is())
continue;
setCellCharAndParagraphProperties(xTextPropertySet);
setCellProperties(xCellPropertySet, bOutline, bTop, bOutline, bBottom);
xCellPropertySet->setPropertyValue(u"ParaAdjust"_ustr,
uno::Any(style::ParagraphAdjust_LEFT));
if (bKeys)
if (xTextPropertySet)
{
xCellPropertySet->setPropertyValue(
u"ParaLeftMargin"_ustr,
uno::Any(nMaxSymbolWidth + sal_Int32(2 * constSymbolMargin)));
setCellCharAndParagraphProperties(xTextPropertySet);
setCellProperties(xCellPropertySet, bOutline, bTop, bOutline, bBottom);
xCellPropertySet->setPropertyValue(u"ParaAdjust"_ustr,
uno::Any(style::ParagraphAdjust_LEFT));
if (bKeys)
{
xCellPropertySet->setPropertyValue(
u"ParaLeftMargin"_ustr,
uno::Any(nMaxSymbolWidth + sal_Int32(2 * constSymbolMargin)));
}
}
}
nRow++;
@ -418,11 +419,22 @@ void DataTableView::createShapes(basegfx::B2DVector const& rStart, basegfx::B2DV
// TABLE
nRow = 1;
const sal_Int32 nTableModelRowCount = m_xTable->getRowCount();
const sal_Int32 nTableModelColCount = m_xTable->getColumnCount();
// tdf#153182 the broken bounds are most likely because we don't know if the
// data-table has header rows and columns. Most likely it does not.
bool bBrokenBounds = false;
for (auto const& rSeries : m_pDataSeriesValues)
{
nColumn = 1;
for (auto const& rValue : rSeries)
{
if (nRow >= nTableModelRowCount || nColumn >= nTableModelColCount)
{
bBrokenBounds = true;
SAL_WARN("chart2", "exceeding bounds of table model?");
break;
}
uno::Reference<table::XCell> xCell = m_xTable->getCellByPosition(nColumn, nRow);
uno::Reference<beans::XPropertySet> xCellPropertySet(xCell, uno::UNO_QUERY);
uno::Reference<text::XTextRange> xCellTextRange(xCell, uno::UNO_QUERY);
@ -431,31 +443,33 @@ void DataTableView::createShapes(basegfx::B2DVector const& rStart, basegfx::B2DV
auto xText = xCellTextRange->getText();
xText->insertString(xText->getStart(), rValue, false);
auto xTextPropertySet = getFirstParagraphProperties(xText);
if (!xTextPropertySet.is())
continue;
if (xTextPropertySet.is())
{
bool bLeft = false;
bool bTop = false;
bool bRight = false;
bool bBottom = false;
bool bLeft = false;
bool bTop = false;
bool bRight = false;
bool bBottom = false;
if (nColumn > 1 && bVBorder)
bLeft = true;
if (nColumn > 1 && bVBorder)
bLeft = true;
if (nRow > 1 && bHBorder)
bTop = true;
if (nRow > 1 && bHBorder)
bTop = true;
if (nRow == nRowCount && bOutline)
bBottom = true;
if (nRow == nRowCount && bOutline)
bBottom = true;
if (nColumn == nColumnCount && bOutline)
bRight = true;
if (nColumn == nColumnCount && bOutline)
bRight = true;
setCellCharAndParagraphProperties(xTextPropertySet);
setCellProperties(xCellPropertySet, bLeft, bTop, bRight, bBottom);
setCellCharAndParagraphProperties(xTextPropertySet);
setCellProperties(xCellPropertySet, bLeft, bTop, bRight, bBottom);
}
}
nColumn++;
}
if (bBrokenBounds)
break;
nRow++;
}

2
comphelper/qa/unit/propertyvalue.cxx
View file

@ -103,7 +103,7 @@ class MakePropertyValueTest : public CppUnit::TestFixture
]
}
}
)json"_ostr);
)json");
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), aRet.size());
beans::PropertyValue aFirst = aRet[0];
CPPUNIT_ASSERT_EQUAL(u"FieldType"_ustr, aFirst.Name);

2
comphelper/source/container/container.cxx
View file

@ -99,7 +99,7 @@ css::uno::Reference< css::uno::XInterface> const & IndexAccessIterator::Next()
break;
}
// Finally, if there's nothing more to do in this row (to the right), we'll move on to the next row.
xSearchLoop = xParent;
xSearchLoop = std::move(xParent);
bCheckingStartingPoint = false;
}

8
comphelper/source/misc/diagnose_ex.cxx
View file

@ -322,14 +322,6 @@ static void exceptionToStringImpl(OStringBuffer& sMessage, const css::uno::Any &
sMessage.append(toOString(comphelper::anyToString( css::uno::Any(specialized.Code) )));
}
}
{
css::xml::dom::DOMException specialized;
if ( caught >>= specialized )
{
sMessage.append(" Code: ");
sMessage.append(toOString(comphelper::anyToString( css::uno::Any(specialized.Code) )));
}
}
{
css::xml::sax::SAXException specialized;
if ( caught >>= specialized )

25
comphelper/source/misc/sequenceashashmap.cxx
View file

@ -302,13 +302,10 @@ void SequenceAsHashMap::update(const SequenceAsHashMap& rUpdate)
}
}
std::vector<css::beans::PropertyValue> JsonToPropertyValues(const OString& rJson)
static std::vector<css::beans::PropertyValue> JsonToPropertyValues(const boost::property_tree::ptree& aTree)
{
std::vector<beans::PropertyValue> aArguments;
boost::property_tree::ptree aTree, aNodeNull, aNodeValue;
std::stringstream aStream((std::string(rJson)));
boost::property_tree::read_json(aStream, aTree);
boost::property_tree::ptree aNodeNull, aNodeValue;
for (const auto& rPair : aTree)
{
const std::string& rType = rPair.second.get<std::string>("type", "");
@ -364,10 +361,7 @@ std::vector<css::beans::PropertyValue> JsonToPropertyValues(const OString& rJson
else if (rType == "[]com.sun.star.beans.PropertyValue")
{
aNodeValue = rPair.second.get_child("value", aNodeNull);
std::stringstream s;
boost::property_tree::write_json(s, aNodeValue);
std::vector<beans::PropertyValue> aPropertyValues = JsonToPropertyValues(OString(s.str()));
aValue.Value <<= comphelper::containerToSequence(aPropertyValues);
aValue.Value <<= comphelper::containerToSequence(JsonToPropertyValues(aNodeValue));
}
else if (rType == "[][]com.sun.star.beans.PropertyValue")
{
@ -375,10 +369,7 @@ std::vector<css::beans::PropertyValue> JsonToPropertyValues(const OString& rJson
std::vector<uno::Sequence<beans::PropertyValue>> aSeqs;
for (const auto& rItem : aNodeValue)
{
std::stringstream s;
boost::property_tree::write_json(s, rItem.second);
std::vector<beans::PropertyValue> aPropertyValues = JsonToPropertyValues(OString(s.str()));
aSeqs.push_back(comphelper::containerToSequence(aPropertyValues));
aSeqs.push_back(comphelper::containerToSequence(JsonToPropertyValues(rItem.second)));
}
aValue.Value <<= comphelper::containerToSequence(aSeqs);
}
@ -389,6 +380,14 @@ std::vector<css::beans::PropertyValue> JsonToPropertyValues(const OString& rJson
return aArguments;
}
std::vector<css::beans::PropertyValue> JsonToPropertyValues(std::string_view rJson)
{
boost::property_tree::ptree aTree;
std::stringstream aStream((std::string(rJson)));
boost::property_tree::read_json(aStream, aTree);
return JsonToPropertyValues(aTree);
}
} // namespace comphelper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
comphelper/source/property/propertycontainerhelper.cxx
View file

@ -399,7 +399,7 @@ void OPropertyContainerHelper::getFastPropertyValue(Any& _rValue, sal_Int32 _nHa
PropertiesIterator aPos = const_cast<OPropertyContainerHelper*>(this)->searchHandle(_nHandle);
if (aPos == m_aProperties.end())
{
OSL_FAIL( "OPropertyContainerHelper::getFastPropertyValue: unknown handle!" );
assert( false && "OPropertyContainerHelper::getFastPropertyValue: unknown handle" );
// should not happen if the derived class has built a correct property set info helper to be used by
// our base class OPropertySetHelper
return;

2
comphelper/source/property/propshlp.cxx
View file

@ -176,6 +176,8 @@ Any OPropertySetHelper::getPropertyValueImpl(std::unique_lock<std::mutex>& rGuar
IPropertyArrayHelper& rPH = getInfoHelper();
// map the name to the handle
sal_Int32 nHandle = rPH.getHandleByName(rPropertyName);
if (nHandle == -1)
throw UnknownPropertyException(rPropertyName);
// call the method of the XFastPropertySet interface
Any aAny;
getFastPropertyValue(rGuard, aAny, nHandle);

2
comphelper/source/streaming/seekableinput.cxx
View file

@ -108,7 +108,7 @@ void OSeekableInputWrapper::PrepareCopy_Impl()
m_xCopyInput.set( xTempOut, uno::UNO_QUERY );
if ( m_xCopyInput.is() )
{
m_xCopySeek = xTempSeek;
m_xCopySeek = std::move(xTempSeek);
m_pCopyByteReader = dynamic_cast<comphelper::ByteReader*>(xTempOut.get());
assert(m_pCopyByteReader);
}

2
compilerplugins/clang/badstatics.cxx
View file

@ -113,7 +113,7 @@ public:
if (!pDefinition) { // maybe no definition if it's a pointer/reference
return std::make_pair(false, std::vector<FieldDecl const*>());
}
if ( type.Class("DeleteOnDeinit").Namespace("vcl").GlobalNamespace()
if ( type.Class("DeleteOnDeinit").Namespace("tools").GlobalNamespace()
|| type.Class("weak_ptr").StdNamespace() // not owning
|| type.Class("ImplWallpaper").GlobalNamespace() // very odd static instance here
|| type.Class("Application").GlobalNamespace() // numerous odd subclasses in vclmain::createApplication()

2
compilerplugins/clang/refcounting.cxx
View file

@ -337,7 +337,7 @@ bool containsSalhelperReferenceObjectSubclass(const clang::Type* pType0) {
if (dc.Class("Reference").Namespace("rtl").GlobalNamespace()
|| (dc.Class("OStoreHandle").AnonymousNamespace().Namespace("store")
.GlobalNamespace())
|| (dc.Class("DeleteRtlReferenceOnDeinit").Namespace("vcl")
|| (dc.Class("DeleteRtlReferenceOnDeinit").Namespace("tools")
.GlobalNamespace()))
{
return false;

2
connectivity/source/commontools/ConnectionWrapper.cxx
View file

@ -82,7 +82,7 @@ void OConnectionWrapper::setDelegation(const Reference< XConnection >& _xConnect
if (xConProxy.is())
{
// transfer the (one and only) real ref to the aggregate to our member
m_xProxyConnection = xConProxy;
m_xProxyConnection = std::move(xConProxy);
// set ourself as delegator
Reference<XInterface> xIf = static_cast< XUnoTunnel* >( this );

2
connectivity/source/commontools/statementcomposer.cxx
View file

@ -216,7 +216,7 @@ namespace dbtools
sStatement = xComposer->getQuery();
_rData.xComposer = xComposer;
_rData.xComposer = std::move(xComposer);
_rData.bComposerDirty = false;
}
}

4
connectivity/source/cpool/ZConnectionPool.cxx
View file

@ -215,7 +215,7 @@ Reference< XConnection> OConnectionPool::createNewConnection(const OUString& _rU
aPack.nALiveCount = m_nALiveCount;
TActiveConnectionInfo aActiveInfo;
aActiveInfo.aPos = m_aPool.emplace(nId,aPack).first;
aActiveInfo.xPooledConnection = xPooledConnection;
aActiveInfo.xPooledConnection = std::move(xPooledConnection);
m_aActiveConnections.emplace(xConnection,aActiveInfo);
if(m_xInvalidator->isExpired())
@ -271,7 +271,7 @@ Reference< XConnection> OConnectionPool::getPooledConnection(TConnectionMap::ite
TActiveConnectionInfo aActiveInfo;
aActiveInfo.aPos = _rIter;
aActiveInfo.xPooledConnection = xPooledConnection;
aActiveInfo.xPooledConnection = std::move(xPooledConnection);
m_aActiveConnections[xConnection] = std::move(aActiveInfo);
}
return xConnection;

2
connectivity/source/cpool/ZPoolCollection.cxx
View file

@ -152,7 +152,7 @@ Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const OUString& _
}
if (xExistentProxy.is())
{
xDriver = xExistentProxy;
xDriver = std::move(xExistentProxy);
}
else
{ // create a new proxy for the driver

2
connectivity/source/drivers/file/FConnection.cxx
View file

@ -179,7 +179,7 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >&
{
Reference<XContent> xParent(Reference<XChild>(aFile.get(),UNO_QUERY_THROW)->getParent(),UNO_QUERY_THROW);
Reference<XContentIdentifier> xIdent = xParent->getIdentifier();
m_xContent = xParent;
m_xContent = std::move(xParent);
::ucbhelper::Content aParent(xIdent->getContentIdentifier(), Reference< XCommandEnvironment >(), comphelper::getProcessComponentContext());
m_xDir = aParent.createDynamicCursor(aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY );

2
connectivity/source/drivers/postgresql/pq_connection.cxx
View file

@ -514,7 +514,7 @@ void Connection::initialize( const Sequence< Any >& aArguments )
m_settings.user = OUString( p, strlen(p), RTL_TEXTENCODING_UTF8);
p = PQdb( m_settings.pConnection );
m_settings.catalog = OUString( p, strlen(p), RTL_TEXTENCODING_UTF8);
m_settings.tc = tc;
m_settings.tc = std::move(tc);
SAL_INFO("connectivity.postgresql", "connection to '" << url << "' successfully opened");
}

1
connectivity/source/parse/sqlbison.y
View file

@ -4505,7 +4505,6 @@ sal_Int32 OSQLParser::s_nRefCount = 0;
// ::osl::Mutex OSQLParser::s_aMutex;
OSQLScanner* OSQLParser::s_pScanner = nullptr;
OSQLParseNodesGarbageCollector* OSQLParser::s_pGarbageCollector = nullptr;
vcl::DeleteOnDeinit<css::uno::Reference< css::i18n::XLocaleData4>> OSQLParser::s_xLocaleData(vcl::DeleteOnDeinitFlag::Empty);
void setParser(OSQLParser* _pParser)
{

2
connectivity/source/parse/sqliterator.cxx
View file

@ -455,7 +455,7 @@ void OSQLParseTreeIterator::traverseOneTableName( OSQLTables& _rTables,const OSQ
// get the object representing this table/query
OSQLTable aTable = impl_locateRecordSource( aComposedName );
if ( aTable.is() )
_rTables[ aTableRange ] = aTable;
_rTables[ aTableRange ] = std::move(aTable);
}
void OSQLParseTreeIterator::impl_fillJoinConditions(const OSQLParseNode* i_pJoinCondition)

12
connectivity/source/parse/sqlnode.cxx
View file

@ -803,6 +803,7 @@ void OSQLParser::killThousandSeparator(OSQLParseNode* pLiteral)
{
if ( pLiteral )
{
auto& s_xLocaleData = getLocaleData();
if ( s_xLocaleData.get()->get()->getLocaleItem( m_pData->aLocale ).decimalSeparator.toChar() == ',' )
{
pLiteral->m_aNodeValue = pLiteral->m_aNodeValue.replace('.', sal_Unicode());
@ -1118,6 +1119,7 @@ OUString OSQLParser::stringToDouble(const OUString& _rValue,sal_Int16 _nScale)
OUString aValue;
if(!m_xCharClass.is())
m_xCharClass = CharacterClassification::create( m_xContext );
auto& s_xLocaleData = getLocaleData();
if( s_xLocaleData.get() )
{
try
@ -1248,10 +1250,13 @@ std::unique_ptr<OSQLParseNode> OSQLParser::predicateTree(OUString& rErrorMessage
s_pScanner->SetRule(OSQLScanner::GetSTRINGRule());
break;
default:
{
auto& s_xLocaleData = getLocaleData();
if ( s_xLocaleData.get()->get()->getLocaleItem( m_pData->aLocale ).decimalSeparator.toChar() == ',' )
s_pScanner->SetRule(OSQLScanner::GetGERRule());
else
s_pScanner->SetRule(OSQLScanner::GetENGRule());
}
}
}
@ -1334,6 +1339,7 @@ OSQLParser::OSQLParser(css::uno::Reference< css::uno::XComponentContext > xConte
s_pScanner->setScanner();
s_pGarbageCollector = new OSQLParseNodesGarbageCollector();
auto& s_xLocaleData = getLocaleData();
if(!s_xLocaleData.get())
s_xLocaleData.set(LocaleData::create(m_xContext));
@ -1473,6 +1479,12 @@ OSQLParser::OSQLParser(css::uno::Reference< css::uno::XComponentContext > xConte
m_pData->aLocale = m_pContext->getPreferredLocale();
}
//static
tools::DeleteOnDeinit<css::uno::Reference< css::i18n::XLocaleData4>>& OSQLParser::getLocaleData()
{
static tools::DeleteOnDeinit<css::uno::Reference< css::i18n::XLocaleData4>> s_xLocaleData(tools::DeleteOnDeinitFlag::Empty);
return s_xLocaleData;
}
OSQLParser::~OSQLParser()
{

2
cppcanvas/source/mtfrenderer/textaction.cxx
View file

@ -465,7 +465,7 @@ namespace cppcanvas::internal
xTextLayout->applyKashidaPositions(aKashidaPositions);
}
io_rTextLayout = xTextLayout;
io_rTextLayout = std::move(xTextLayout);
}

10
cppu/source/uno/copy.hxx
View file

@ -149,6 +149,7 @@ inline void _copyConstructAnyFromData(
break;
case typelib_TypeClass_LONG:
case typelib_TypeClass_UNSIGNED_LONG:
case typelib_TypeClass_ENUM: // enum is forced to 32bit long
pDestAny->pData = &pDestAny->pReserved;
*static_cast<sal_Int32 *>(pDestAny->pData) = *static_cast<sal_Int32 *>(pSource);
break;
@ -190,11 +191,6 @@ inline void _copyConstructAnyFromData(
case typelib_TypeClass_ANY:
OSL_FAIL( "### unexpected nested any!" );
break;
case typelib_TypeClass_ENUM:
pDestAny->pData = &pDestAny->pReserved;
// enum is forced to 32bit long
*static_cast<sal_Int32 *>(pDestAny->pData) = *static_cast<sal_Int32 *>(pSource);
break;
case typelib_TypeClass_STRUCT:
case typelib_TypeClass_EXCEPTION:
if (pTypeDescr)
@ -562,6 +558,7 @@ inline void _copyConstructData(
break;
case typelib_TypeClass_LONG:
case typelib_TypeClass_UNSIGNED_LONG:
case typelib_TypeClass_ENUM:
*static_cast<sal_Int32 *>(pDest) = *static_cast<sal_Int32 *>(pSource);
break;
case typelib_TypeClass_HYPER:
@ -588,9 +585,6 @@ inline void _copyConstructData(
static_cast<uno_Any *>(pSource)->pType, nullptr,
acquire, mapping );
break;
case typelib_TypeClass_ENUM:
*static_cast<sal_Int32 *>(pDest) = *static_cast<sal_Int32 *>(pSource);
break;
case typelib_TypeClass_STRUCT:
case typelib_TypeClass_EXCEPTION:
if (pTypeDescr)

6
cppuhelper/source/component_context.cxx
View file

@ -410,11 +410,11 @@ void ComponentContext::disposing(std::unique_lock<std::mutex>& rGuard)
{
if ( rName == TDMGR_SINGLETON )
{
xTDMgr = xComp;
xTDMgr = std::move(xComp);
}
else if ( rName == AC_SINGLETON )
{
xAC = xComp;
xAC = std::move(xComp);
}
else // dispose immediately
{
@ -547,7 +547,7 @@ extern "C" { static void s_createComponentContext_v(va_list * pParam)
}
else
{
xContext = xDelegate;
xContext = std::move(xDelegate);
}
*ppContext = pTarget2curr->mapInterface(xContext.get(), cppu::UnoType<decltype(xContext)>::get());

10
cppuhelper/source/servicemanager.cxx
View file

@ -756,7 +756,7 @@ void cppuhelper::ServiceManager::Data::Implementation::updateDisposeInstance(
if (comp.is()) {
std::unique_lock g(mutex);
if (dispose) {
disposeInstance = comp;
disposeInstance = std::move(comp);
}
}
}
@ -872,8 +872,8 @@ void cppuhelper::ServiceManager::loadImplementation(
{
implementation->status = Data::Implementation::STATUS_LOADED;
implementation->constructorFn = std::move(ctor);
implementation->factory1 = f1;
implementation->factory2 = f2;
implementation->factory1 = std::move(f1);
implementation->factory2 = std::move(f2);
}
}
@ -1961,8 +1961,8 @@ void cppuhelper::ServiceManager::preloadImplementations() {
if (!rEntry.second->constructorName.isEmpty() && fpFactory)
rEntry.second->constructorFn = WrapperConstructorFn(reinterpret_cast<ImplementationConstructorFn *>(fpFactory));
rEntry.second->factory1 = xSCFactory;
rEntry.second->factory2 = xSSFactory;
rEntry.second->factory1 = std::move(xSCFactory);
rEntry.second->factory2 = std::move(xSSFactory);
rEntry.second->status = Data::Implementation::STATUS_LOADED;
}

2
cui/source/dialogs/QrCodeGenDialog.cxx
View file

@ -215,7 +215,7 @@ QrCodeGenDialog::QrCodeGenDialog(weld::Widget* pParent, Reference<XModel> xModel
m_xComboType->set_active(aBarCode.Type);
// Mark this as existing shape
m_xExistingShapeProperties = xProps;
m_xExistingShapeProperties = std::move(xProps);
}
short QrCodeGenDialog::run()

2
cui/source/dialogs/SignatureLineDialog.cxx
View file

@ -88,7 +88,7 @@ SignatureLineDialog::SignatureLineDialog(weld::Widget* pParent, Reference<XModel
m_xCheckboxShowSignDate->set_active(bShowSignDate);
// Mark this as existing shape
m_xExistingShapeProperties = xProps;
m_xExistingShapeProperties = std::move(xProps);
}
void SignatureLineDialog::Apply()

11
cui/source/tabpages/measure.cxx
View file

@ -274,6 +274,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
}
break;
case css::drawing::MeasureTextVertPos_CENTERED:
case css::drawing::MeasureTextVertPos_AUTO:
switch( eHPos )
{
case css::drawing::MeasureTextHorzPos_LEFTOUTSIDE: eRP = RectPoint::LM; break;
@ -293,16 +294,6 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
default: break;
}
break;
case css::drawing::MeasureTextVertPos_AUTO:
switch( eHPos )
{
case css::drawing::MeasureTextHorzPos_LEFTOUTSIDE: eRP = RectPoint::LM; break;
case css::drawing::MeasureTextHorzPos_INSIDE: eRP = RectPoint::MM; break;
case css::drawing::MeasureTextHorzPos_RIGHTOUTSIDE: eRP = RectPoint::RM; break;
case css::drawing::MeasureTextHorzPos_AUTO: eRP = RectPoint::MM; break;
default: break;
}
break;
default: ;//prevent warning
}

68
cui/uiconfig/ui/optnewdictionarydialog.ui
View file

@ -89,6 +89,20 @@
<property name="column_spacing">12</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
<child>
<object class="GtkLabel" id="name_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="optnewdictionarydialog|name_label">_Name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">nameedit</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="nameedit">
<property name="visible">True</property>
@ -108,20 +122,6 @@
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="name_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="optnewdictionarydialog|name_label">_Name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">nameedit</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="language_label">
<property name="visible">True</property>
@ -136,26 +136,6 @@
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="except">
<property name="label" translatable="yes" context="optnewdictionarydialog|except">_Exception (-)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="except-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="except">Specifies whether you wish to avoid certain words in your documents.</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="language">
<property name="visible">True</property>
@ -179,6 +159,26 @@
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="except">
<property name="label" translatable="yes" context="optnewdictionarydialog|except">_Exception (-)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="except-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="except">Specifies whether you wish to avoid certain words in your documents.</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">2</property>
</packing>
</child>
</object>
</child>
<child type="label">

2
dbaccess/source/core/dataaccess/ModelImpl.cxx
View file

@ -1398,7 +1398,7 @@ bool ODatabaseModelImpl::hasTrustedScriptingSignature(
{
task::DocumentMacroConfirmationRequest aRequest;
aRequest.DocumentURL = m_sDocFileLocation;
aRequest.DocumentStorage = xStorage;
aRequest.DocumentStorage = std::move(xStorage);
aRequest.DocumentSignatureInformation = aInfo;
aRequest.DocumentVersion = aODFVersion;
aRequest.Classification = task::InteractionClassification_QUERY;

2
dbaccess/source/core/misc/apitools.cxx
View file

@ -74,7 +74,7 @@ void OSubComponent::release() noexcept
if (xParent.is())
{
MutexGuard aGuard( rBHelper.rMutex );
m_xParent = xParent;
m_xParent = std::move(xParent);
}
// destroy the object if xHoldAlive decrement the refcount to 0

10
dbaccess/source/ui/app/AppController.cxx
View file

@ -814,6 +814,8 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
aReturn.bChecked = getContainer()->getPreviewMode() == PreviewMode::Document;
break;
case ID_BROWSER_UNDO:
case SID_DB_APP_SENDREPORTTOWRITER:
case SID_DB_APP_DBADMIN:
aReturn.bEnabled = false;
break;
case SID_MAIL_SENDDOC:
@ -825,10 +827,6 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
aReturn.bEnabled = E_REPORT == eType && getContainer()->getSelectionCount() > 0 && getContainer()->isALeafSelected();
}
break;
case SID_DB_APP_SENDREPORTTOWRITER:
case SID_DB_APP_DBADMIN:
aReturn.bEnabled = false;
break;
case SID_DB_APP_STATUS_TYPE:
aReturn.bEnabled = m_xDataSource.is();
if ( aReturn.bEnabled )
@ -1248,8 +1246,6 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
case SID_DB_APP_QUERY_OPEN:
case SID_DB_APP_FORM_OPEN:
case SID_DB_APP_REPORT_OPEN:
doAction( _nId, ElementOpenMode::Normal );
break;
case SID_DB_APP_CONVERTTOVIEW:
doAction( _nId, ElementOpenMode::Normal );
break;
@ -2034,7 +2030,7 @@ void OApplicationController::renameEntry()
Reference<XHierarchicalNameContainer> xParent(xChild->getParent(),UNO_QUERY);
if ( xParent.is() )
{
xHNames = xParent;
xHNames = std::move(xParent);
Reference<XPropertySet>(xRename,UNO_QUERY_THROW)->getPropertyValue(PROPERTY_NAME) >>= sName;
}
}

2
dbaccess/source/ui/dlg/CollectionView.cxx
View file

@ -229,7 +229,7 @@ IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView, weld::TreeView&, bool)
xContent.set(xNameAccess->getByName(sSubFolder),UNO_QUERY);
if ( xContent.is() )
{
m_xContent = xContent;
m_xContent = std::move(xContent);
Initialize();
initCurrentPath();
}

4
dbaccess/source/ui/dlg/ConnectionPage.cxx
View file

@ -101,9 +101,6 @@ namespace dbaui
m_xFT_Connection->set_label(DBA_RES(STR_WRITER_PATH_OR_FILE));
m_xConnectionURL->set_help_id(HID_DSADMIN_WRITER_PATH);
break;
case ::dbaccess::DST_ADO:
m_xFT_Connection->set_label(DBA_RES(STR_COMMONURL));
break;
case ::dbaccess::DST_MSACCESS:
m_xFT_Connection->set_label(DBA_RES(STR_MSACCESS_MDB_FILE));
m_xConnectionURL->set_help_id(HID_DSADMIN_MSACCESS_MDB_FILE);
@ -150,6 +147,7 @@ namespace dbaui
}
m_xConnectionURL->hide();
break;
case ::dbaccess::DST_ADO:
case ::dbaccess::DST_JDBC:
default:
m_xFT_Connection->set_label(DBA_RES(STR_COMMONURL));

17
dbaccess/source/ui/misc/DExport.cxx
View file

@ -421,9 +421,6 @@ sal_Int16 ODatabaseExport::CheckString(const OUString& aCheckToken, sal_Int16 _n
case NumberFormat::ALL:
nNumberFormat = NumberFormat::ALL;
break;
case NumberFormat::DEFINED:
nNumberFormat = NumberFormat::TEXT;
break;
case NumberFormat::DATE:
switch(_nOldNumberFormat)
{
@ -459,12 +456,10 @@ sal_Int16 ODatabaseExport::CheckString(const OUString& aCheckToken, sal_Int16 _n
case NumberFormat::CURRENCY:
switch(_nOldNumberFormat)
{
case NumberFormat::NUMBER:
nNumberFormat = NumberFormat::CURRENCY;
break;
case NumberFormat::CURRENCY:
nNumberFormat = _nOldNumberFormat;
break;
case NumberFormat::NUMBER:
case NumberFormat::ALL:
nNumberFormat = NumberFormat::CURRENCY;
break;
@ -496,6 +491,7 @@ sal_Int16 ODatabaseExport::CheckString(const OUString& aCheckToken, sal_Int16 _n
case NumberFormat::TEXT:
case NumberFormat::UNDEFINED:
case NumberFormat::LOGICAL:
case NumberFormat::DEFINED:
nNumberFormat = NumberFormat::TEXT; // Text overwrites everything
break;
case NumberFormat::DATETIME:
@ -548,13 +544,6 @@ void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfo
switch ( nType )
{
case NumberFormat::ALL:
nDataType = DataType::DOUBLE;
break;
case NumberFormat::DEFINED:
nDataType = DataType::VARCHAR;
nLength = ((m_vColumnSize[i] % 10 ) ? m_vColumnSize[i]/ 10 + 1: m_vColumnSize[i]/ 10) * 10;
break;
case NumberFormat::DATE:
nDataType = DataType::DATE;
break;
@ -569,12 +558,14 @@ void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfo
nScale = 4;
nLength = 19;
break;
case NumberFormat::ALL:
case NumberFormat::NUMBER:
case NumberFormat::SCIENTIFIC:
case NumberFormat::FRACTION:
case NumberFormat::PERCENT:
nDataType = DataType::DOUBLE;
break;
case NumberFormat::DEFINED:
case NumberFormat::TEXT:
case NumberFormat::UNDEFINED:
case NumberFormat::LOGICAL:

2
dbaccess/source/ui/querydesign/QueryTableView.cxx
View file

@ -493,10 +493,10 @@ void OQueryTableView::AddTabWin(const OUString& _rComposedName, const OUString&
if ( pTabWinTmp == pNewTabWin )
continue;
assert(pTabWinTmp && "TableWindow is null!");
if ( pTabWinTmp->GetData()->isQuery() )
continue;
assert(pTabWinTmp && "TableWindow is null!");
Reference< XPropertySet > xFKKey = getKeyReferencedTo( pTabWinTmp->GetData()->getKeys(), pNewTabWin->GetComposedName() );
if ( !xFKKey.is() )
continue;

2
dbaccess/source/ui/querydesign/querycontroller.cxx
View file

@ -689,8 +689,6 @@ void OQueryController::impl_initialize(const ::comphelper::NamedValueCollection&
switch ( m_nCommandType )
{
case CommandType::QUERY:
m_sName = sCommand;
break;
case CommandType::TABLE:
m_sName = sCommand;
break;

2
dbaccess/source/ui/tabledesign/TableController.cxx
View file

@ -1318,7 +1318,7 @@ void OTableController::assignTable()
if (!xProp.is())
return;
m_xTable = xProp;
m_xTable = std::move(xProp);
startTableListening();
// check if we set the table editable

4
dbaccess/source/ui/uno/copytablewizard.cxx
View file

@ -875,7 +875,7 @@ SharedConnection CopyTableWizard::impl_extractConnection_throw( const Reference<
while ( false );
if ( xInteractionHandler != m_xInteractionHandler )
_out_rxDocInteractionHandler = xInteractionHandler;
_out_rxDocInteractionHandler = std::move(xInteractionHandler);
return xConnection;
}
@ -1499,7 +1499,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments )
impl_ensureDataAccessDescriptor_throw( _rArguments, 1, m_xDestConnection, xDestDocHandler );
if ( xDestDocHandler.is() && !m_xInteractionHandler.is() )
m_xInteractionHandler = xDestDocHandler;
m_xInteractionHandler = std::move(xDestDocHandler);
Reference< XPropertySet > xInteractionHandler(m_xInteractionHandler, UNO_QUERY);
if (xInteractionHandler.is())

16
desktop/source/app/app.cxx
View file

@ -713,6 +713,8 @@ OUString Desktop::CreateErrorMsgString(
/// the bootstrap INI file could not be found or read
case ::utl::Bootstrap::MISSING_BOOTSTRAP_FILE:
/// the version locator INI file could not be found or read
case ::utl::Bootstrap::MISSING_VERSION_FILE:
{
aMsg = DpResId(STR_BOOTSTRAP_ERR_FILE_MISSING);
}
@ -727,13 +729,6 @@ OUString Desktop::CreateErrorMsgString(
}
break;
/// the version locator INI file could not be found or read
case ::utl::Bootstrap::MISSING_VERSION_FILE:
{
aMsg = DpResId(STR_BOOTSTRAP_ERR_FILE_MISSING);
}
break;
/// the version locator INI has no entry for this version
case ::utl::Bootstrap::MISSING_VERSION_FILE_ENTRY:
{
@ -1409,12 +1404,9 @@ int Desktop::Main()
}
}
// check if accessibility is enabled but not working and allow to quit
// check if accessibility is enabled
if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
{
if( !InitAccessBridge() )
return EXIT_FAILURE;
}
InitAccessBridge();
#endif
// terminate if requested...

10
desktop/source/deployment/gui/dp_gui_dialog2.cxx
View file

@ -776,7 +776,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleCloseBtn, weld::Button&, void)
IMPL_LINK( ExtMgrDialog, startProgress, void*, _bLockInterface, void )
{
std::unique_lock aGuard( m_aMutex );
SolarMutexGuard aGuard;
bool bLockInterface = static_cast<bool>(_bLockInterface);
if ( m_bStartProgress && !m_bHasProgress )
@ -815,7 +815,7 @@ IMPL_LINK( ExtMgrDialog, startProgress, void*, _bLockInterface, void )
void ExtMgrDialog::showProgress( bool _bStart )
{
std::unique_lock aGuard( m_aMutex );
SolarMutexGuard aGuard;
bool bStart = _bStart;
@ -839,7 +839,7 @@ void ExtMgrDialog::showProgress( bool _bStart )
void ExtMgrDialog::updateProgress( const tools::Long nProgress )
{
std::unique_lock aGuard( m_aMutex );
SolarMutexGuard aGuard;
if ( m_nProgress != nProgress )
{
m_nProgress = nProgress;
@ -851,7 +851,7 @@ void ExtMgrDialog::updateProgress( const tools::Long nProgress )
void ExtMgrDialog::updateProgress( const OUString &rText,
const uno::Reference< task::XAbortChannel > &xAbortChannel)
{
std::unique_lock aGuard( m_aMutex );
SolarMutexGuard aGuard;
m_xAbortChannel = xAbortChannel;
m_sProgressText = rText;
@ -945,7 +945,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleUpdateBtn, weld::Button&, void)
IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl, Timer *, void)
{
std::unique_lock aGuard( m_aMutex );
SolarMutexGuard aGuard;
if ( m_bStopProgress )
{
m_bHasProgress = false;

1
desktop/source/deployment/gui/dp_gui_dialog2.hxx
View file

@ -92,7 +92,6 @@ class ExtMgrDialog : public weld::GenericDialogController
{
const OUString m_sAddPackages;
OUString m_sProgressText;
std::mutex m_aMutex;
bool m_bHasProgress;
bool m_bProgressChanged;
bool m_bStartProgress;

2
desktop/source/deployment/manager/dp_managerfac.cxx
View file

@ -164,7 +164,7 @@ PackageManagerFactoryImpl::getPackageManager( OUString const & context )
{
guard.clear();
try_dispose( xRet );
xRet = xAlreadyIn;
xRet = std::move(xAlreadyIn);
}
else
{

2
desktop/source/deployment/misc/dp_dependencies.cxx
View file

@ -148,7 +148,7 @@ check(dp_misc::DescriptionInfoset const & infoset) {
minimalVersionOpenOfficeOrg));
}
if (!sat) {
unsatisfiedRange[unsat++] = e;
unsatisfiedRange[unsat++] = std::move(e);
}
}
unsatisfied.realloc(unsat);

2
desktop/source/deployment/misc/dp_update.cxx
View file

@ -169,7 +169,7 @@ void getDefaultUpdateInfos(
dp_misc::GREATER)
{
j->second.version = v;
j->second.info = node;
j->second.info = std::move(node);
}
}
}

11
desktop/source/lib/lokclipboard.cxx
View file

@ -9,7 +9,7 @@
#include "lokclipboard.hxx"
#include <unordered_map>
#include <vcl/lazydelete.hxx>
#include <tools/lazydelete.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/lokhelper.hxx>
#include <sal/log.hxx>
@ -20,7 +20,12 @@ using namespace css;
using namespace css::uno;
/* static */ osl::Mutex LOKClipboardFactory::gMutex;
static vcl::DeleteOnDeinit<std::unordered_map<int, rtl::Reference<LOKClipboard>>> gClipboards{};
static tools::DeleteOnDeinit<std::unordered_map<int, rtl::Reference<LOKClipboard>>>& getClipboards()
{
static tools::DeleteOnDeinit<std::unordered_map<int, rtl::Reference<LOKClipboard>>>
gClipboards{};
return gClipboards;
}
rtl::Reference<LOKClipboard> LOKClipboardFactory::getClipboardForCurView()
{
@ -28,6 +33,7 @@ rtl::Reference<LOKClipboard> LOKClipboardFactory::getClipboardForCurView()
osl::MutexGuard aGuard(gMutex);
auto& gClipboards = getClipboards();
auto it = gClipboards.get()->find(nViewId);
if (it != gClipboards.get()->end())
{
@ -44,6 +50,7 @@ void LOKClipboardFactory::releaseClipboardForView(int nViewId)
{
osl::MutexGuard aGuard(gMutex);
auto& gClipboards = getClipboards();
if (nViewId < 0) // clear all
{
gClipboards.get()->clear();

2
desktop/source/migration/migration.cxx
View file

@ -1070,7 +1070,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat
}
if (sCommandURL == sToken) {
xTemp = xChild;
xTemp = std::move(xChild);
break;
}
}

8
download.lst
View file

@ -457,8 +457,8 @@ LIBWEBP_TARBALL := libwebp-1.4.0.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
XMLSEC_SHA256SUM := 2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917
XMLSEC_TARBALL := xmlsec1-1.3.5.tar.gz
XMLSEC_SHA256SUM := 952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f
XMLSEC_TARBALL := xmlsec1-1.3.6.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
@ -645,8 +645,8 @@ TWAIN_DSM_TARBALL := twaindsm_2.4.1.orig.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
VISIO_SHA256SUM := 8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c
VISIO_TARBALL := libvisio-0.1.7.tar.xz
VISIO_SHA256SUM := b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b
VISIO_TARBALL := libvisio-0.1.8.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts

2
drawinglayer/source/primitive2d/controlprimitive2d.cxx
View file

@ -74,7 +74,7 @@ namespace drawinglayer::primitive2d
xXControl->setModel(getControlModel());
// remember XControl
mxXControl = xXControl;
mxXControl = std::move(xXControl);
}
}

4
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
View file

@ -30,7 +30,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <vcl/timer.hxx>
#include <vcl/lazydelete.hxx>
#include <tools/lazydelete.hxx>
#include <vcl/dibtools.hxx>
#include <vcl/skia/SkiaHelper.hxx>
#include <mutex>
@ -383,7 +383,7 @@ VDevBuffer& getVDevBuffer()
// secure global instance with Vcl's safe destroyer of external (seen by
// library base) stuff, the remembered VDevs need to be deleted before
// Vcl's deinit
static vcl::DeleteOnDeinit<VDevBuffer> aVDevBuffer{};
static tools::DeleteOnDeinit<VDevBuffer> aVDevBuffer{};
return *aVDevBuffer.get();
}

18
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
View file

@ -521,10 +521,6 @@ void VclMetafileProcessor2D::popList()
popStructureElement(vcl::PDFWriter::List);
}
// init static break iterator
vcl::DeleteOnDeinit<uno::Reference<css::i18n::XBreakIterator>>
VclMetafileProcessor2D::mxBreakIterator;
VclMetafileProcessor2D::VclMetafileProcessor2D(const geometry::ViewInformation2D& rViewInformation,
OutputDevice& rOutDev)
: VclProcessor2D(rViewInformation, rOutDev)
@ -1495,14 +1491,22 @@ void VclMetafileProcessor2D::processTextSimplePortionPrimitive2D(
// #i101169# if(pTextDecoratedCandidate)
{
/* break iterator support
made static so it only needs to be fetched once, even with many single
constructed VclMetafileProcessor2D. It's still incarnated on demand,
but exists for OOo runtime now by purpose.
*/
static tools::DeleteOnDeinit<css::uno::Reference<css::i18n::XBreakIterator>>
gxBreakIterator;
// support for TEXT_ MetaFile actions only for decorated texts
if (!mxBreakIterator.get() || !mxBreakIterator.get()->get())
if (!gxBreakIterator.get() || !gxBreakIterator.get()->get())
{
uno::Reference<uno::XComponentContext> xContext(
::comphelper::getProcessComponentContext());
mxBreakIterator.set(i18n::BreakIterator::create(xContext));
gxBreakIterator.set(i18n::BreakIterator::create(xContext));
}
auto& rBreakIterator = *mxBreakIterator.get()->get();
auto& rBreakIterator = *gxBreakIterator.get()->get();
const OUString& rTxt = rTextCandidate.getText();
const sal_Int32 nTextLength(rTextCandidate.getTextLength()); // rTxt.getLength());

9
drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
View file

@ -25,7 +25,7 @@
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <vcl/pdfextoutdevdata.hxx> // vcl::PDFExtOutDevData support
#include <vcl/lazydelete.hxx>
#include <tools/lazydelete.hxx>
class GDIMetaFile;
namespace tools
@ -171,13 +171,6 @@ private:
*/
double mfCurrentUnifiedTransparence;
/* break iterator support
made static so it only needs to be fetched once, even with many single
constructed VclMetafileProcessor2D. It's still incarnated on demand,
but exists for OOo runtime now by purpose.
*/
static vcl::DeleteOnDeinit<css::uno::Reference<css::i18n::XBreakIterator>> mxBreakIterator;
/* vcl::PDFExtOutDevData support
For the first step, some extra actions at vcl::PDFExtOutDevData need to
be emulated with the VclMetafileProcessor2D. These are potentially temporarily

4
editeng/source/editeng/editeng.cxx
View file

@ -67,7 +67,7 @@
#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
#include <vcl/help.hxx>
#include <vcl/lazydelete.hxx>
#include <tools/lazydelete.hxx>
#include <vcl/transfer.hxx>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/frame/Desktop.hpp>
@ -1714,7 +1714,7 @@ rtl::Reference<SfxItemPool> EditEngine::CreatePool()
SfxItemPool& EditEngine::GetGlobalItemPool()
{
static vcl::DeleteOnDeinit<rtl::Reference<SfxItemPool>> pGlobalPool(CreatePool());
static tools::DeleteOnDeinit<rtl::Reference<SfxItemPool>> pGlobalPool(CreatePool());
return **pGlobalPool.get();
}

1
editeng/source/editeng/editobj2.hxx
View file

@ -55,6 +55,7 @@ public:
XEditAttribute(SfxItemPool&, const SfxPoolItem&, sal_Int32 nStart, sal_Int32 nEnd );
const SfxPoolItem* GetItem() const { return maItemHolder.getItem(); }
SfxPoolItemHolder& GetItemHolder() { return maItemHolder; }
sal_Int32& GetStart() { return nStart; }
sal_Int32& GetEnd() { return nEnd; }

6
editeng/source/editeng/eerdll.cxx
View file

@ -65,7 +65,7 @@
#include <editeng/forbiddencharacterstable.hxx>
#include <editeng/justifyitem.hxx>
#include <tools/mapunit.hxx>
#include <vcl/lazydelete.hxx>
#include <tools/lazydelete.hxx>
#include <svl/itempool.hxx>
#include <editeng/editids.hrc>
@ -78,7 +78,7 @@ EditDLL& EditDLL::Get()
Previously this data was function-static, but then data in i18npool would
be torn down before the destructor here ran, causing a crash.
*/
static vcl::DeleteOnDeinit< EditDLL > gaEditDll;
static tools::DeleteOnDeinit< EditDLL > gaEditDll;
return *gaEditDll.get();
}
@ -157,7 +157,7 @@ ItemInfoPackage& getItemInfoPackageEditEngine()
{ EE_FEATURE_TAB, new SfxVoidItem( EE_FEATURE_TAB ), 0, SFX_ITEMINFOFLAG_NONE },
{ EE_FEATURE_LINEBR, new SfxVoidItem( EE_FEATURE_LINEBR ), 0, SFX_ITEMINFOFLAG_NONE },
{ EE_FEATURE_NOTCONV, new SvxColorItem( COL_RED, EE_FEATURE_NOTCONV ), SID_ATTR_CHAR_CHARSETCOLOR, SFX_ITEMINFOFLAG_NONE },
{ EE_FEATURE_FIELD, new SvxFieldItem( SvxFieldData(), EE_FEATURE_FIELD ), SID_FIELD, SFX_ITEMINFOFLAG_SUPPORT_SURROGATE }
{ EE_FEATURE_FIELD, new SvxFieldItem( SvxFieldData(), EE_FEATURE_FIELD ), SID_FIELD, SFX_ITEMINFOFLAG_NONE }
}};
virtual const ItemInfoStatic& getItemInfoStatic(size_t nIndex) const override { return maItemInfos[nIndex]; }

39
editeng/source/editeng/fieldupdater.cxx
View file

@ -18,6 +18,22 @@ using namespace com::sun::star;
namespace editeng {
SvxFieldItemUpdater::~SvxFieldItemUpdater() {}
namespace {
class SvxFieldItemUpdaterImpl : public SvxFieldItemUpdater
{
SfxPoolItemHolder& mrItemHolder;
public:
SvxFieldItemUpdaterImpl(SfxPoolItemHolder& rHolder) : mrItemHolder(rHolder) {}
virtual void SetItem(const SvxFieldItem& rNewItem)
{
mrItemHolder = SfxPoolItemHolder(mrItemHolder.getPool(), &rNewItem, false);
}
};
}
class FieldUpdaterImpl
{
EditTextObjectImpl& mrObj;
@ -51,6 +67,24 @@ public:
}
}
}
void UpdatePageRelativeURLs(const std::function<void(const SvxFieldItem & rFieldItem, SvxFieldItemUpdater& rFieldItemUpdater)>& rItemCallback)
{
EditTextObjectImpl::ContentInfosType& rContents = mrObj.GetContents();
for (std::unique_ptr<ContentInfo> & i : rContents)
{
ContentInfo& rContent = *i;
for (XEditAttribute & rAttr : rContent.GetCharAttribs())
{
const SfxPoolItem* pItem = rAttr.GetItem();
if (pItem->Which() != EE_FEATURE_FIELD)
// This is not a field item.
continue;
SvxFieldItemUpdaterImpl aUpdater(rAttr.GetItemHolder());
rItemCallback(static_cast<const SvxFieldItem&>(*pItem), aUpdater);
}
}
}
};
FieldUpdater::FieldUpdater(EditTextObject& rObj) : mpImpl(new FieldUpdaterImpl(rObj)) {}
@ -65,6 +99,11 @@ void FieldUpdater::updateTableFields(int nTab)
mpImpl->updateTableFields(nTab);
}
void FieldUpdater::UpdatePageRelativeURLs(const std::function<void(const SvxFieldItem & rFieldItem, SvxFieldItemUpdater& rFieldItemUpdater)>& rItemCallback)
{
mpImpl->UpdatePageRelativeURLs(rItemCallback);
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

3
editeng/source/editeng/impedit5.cxx
View file

@ -937,11 +937,10 @@ bool ImpEditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView
}
default: // is then possible edited below.
eFunc = KeyFuncType::DONTKNOW;
break;
}
}
if ( eFunc == KeyFuncType::DONTKNOW )
{
switch ( nCode )
{

2
editeng/source/misc/splwrap.cxx
View file

@ -394,7 +394,7 @@ Reference< XDictionary > SvxSpellWrapper::GetAllRightDic()
Reference< frame::XStorable > xStor( xTmp, UNO_QUERY );
if (xStor.is() && xStor->hasLocation() && !xStor->isReadonly())
{
xDic = xTmp;
xDic = std::move(xTmp);
}
}
}

2
editeng/source/misc/unolingu.cxx
View file

@ -659,7 +659,7 @@ uno::Reference< XDictionary > LinguMgr::GetStandard()
xTmpDicList->addDictionary( xTmp );
xTmp->setActive( true );
}
xDic = xTmp;
xDic = std::move(xTmp);
}
#if OSL_DEBUG_LEVEL > 1
uno::Reference< XStorable > xStor( xDic, UNO_QUERY );

10
editeng/source/uno/unofield.cxx
View file

@ -801,6 +801,8 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames()
switch (mnServiceId)
{
case text::textfield::Type::DATE:
case text::textfield::Type::TIME:
case text::textfield::Type::EXTENDED_TIME:
pServices[2] = "com.sun.star.text.TextField.DateTime";
pServices[3] = "com.sun.star.text.textfield.DateTime";
break;
@ -816,10 +818,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames()
pServices[2] = "com.sun.star.text.TextField.PageCount";
pServices[3] = "com.sun.star.text.textfield.PageCount";
break;
case text::textfield::Type::TIME:
pServices[2] = "com.sun.star.text.TextField.DateTime";
pServices[3] = "com.sun.star.text.textfield.DateTime";
break;
case text::textfield::Type::DOCINFO_TITLE:
pServices[2] = "com.sun.star.text.TextField.docinfo.Title";
pServices[3] = "com.sun.star.text.textfield.docinfo.Title";
@ -828,10 +826,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames()
pServices[2] = "com.sun.star.text.TextField.SheetName";
pServices[3] = "com.sun.star.text.textfield.SheetName";
break;
case text::textfield::Type::EXTENDED_TIME:
pServices[2] = "com.sun.star.text.TextField.DateTime";
pServices[3] = "com.sun.star.text.textfield.DateTime";
break;
case text::textfield::Type::EXTENDED_FILE:
pServices[2] = "com.sun.star.text.TextField.FileName";
pServices[3] = "com.sun.star.text.textfield.FileName";

2
embeddedobj/source/commonembedding/persistence.cxx
View file

@ -1431,7 +1431,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
}
m_bWaitSaveCompleted = true;
m_xNewObjectStorage = xSubStorage;
m_xNewObjectStorage = std::move(xSubStorage);
m_xNewParentStorage = xStorage;
m_aNewEntryName = sEntName;
m_aNewDocMediaDescriptor = GetValuableArgs_Impl( lArguments, true );

6
embeddedobj/source/general/docholder.cxx
View file

@ -411,7 +411,7 @@ bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >& xPar
xHatchWindow->setController( uno::Reference< embed::XHatchWindowController >(
static_cast< embed::XHatchWindowController* >( this ) ) );
xMyParent = xHatchWinPeer;
xMyParent = std::move(xHatchWinPeer);
}
else
{
@ -453,8 +453,8 @@ bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >& xPar
// the call will create, initialize the frame, and register it in the parent
m_xFrame.set( xFrameFact->createInstanceWithArguments( aArgs ), uno::UNO_QUERY_THROW );
m_xHatchWindow = xHWindow;
m_xOwnWindow = xOwnWindow;
m_xHatchWindow = std::move(xHWindow);
m_xOwnWindow = std::move(xOwnWindow);
if ( !SetFrameLMVisibility( m_xFrame, false ) )
{

4
embeddedobj/source/msole/olepersist.cxx
View file

@ -1241,7 +1241,7 @@ void OleEmbeddedObject::StoreToLocation_Impl(
if ( bSaveAs )
{
m_bWaitSaveCompleted = true;
m_xNewObjectStream = xTargetStream;
m_xNewObjectStream = std::move(xTargetStream);
m_xNewParentStorage = xStorage;
m_aNewEntryName = sEntName;
m_bNewVisReplInStream = bStoreVis;
@ -1252,7 +1252,7 @@ void OleEmbeddedObject::StoreToLocation_Impl(
if ( bNeedLocalCache )
m_xNewCachedVisRepl = GetNewFilledTempStream_Impl( xCachedVisualRepresentation->getInputStream() );
else
m_xNewCachedVisRepl = xCachedVisualRepresentation;
m_xNewCachedVisRepl = std::move(xCachedVisualRepresentation);
}
// TODO: register listeners for storages above, in case they are disposed

2
embeddedobj/source/msole/ownview.cxx
View file

@ -142,7 +142,7 @@ bool OwnView_Impl::CreateModelFromURL( const OUString& aFileURL )
xCloseable->addCloseListener( uno::Reference< util::XCloseListener >(this) );
::osl::MutexGuard aGuard( m_aMutex );
m_xModel = xModel;
m_xModel = std::move(xModel);
bResult = true;
}
}

2
extensions/source/abpilot/datasourcehandling.cxx
View file

@ -118,7 +118,7 @@ namespace abp
if (xContext.is())
{
// xDynamicContext->registerObject( _rName, xNewDataSource );
_rxNewDataSource = xNewDataSource;
_rxNewDataSource = std::move(xNewDataSource);
}
}

2
extensions/source/dbpilots/controlwizard.cxx
View file

@ -340,7 +340,7 @@ namespace dbp
{
DBG_ASSERT(xPage.is(), "OControlWizard::implDeterminePage: can't determine the page (no model)!");
}
m_aContext.xDrawPage = xPage;
m_aContext.xDrawPage = std::move(xPage);
}
catch(const Exception&)
{

2
extensions/source/propctrlr/formcomponenthandler.cxx
View file

@ -225,7 +225,7 @@ namespace pcr
if( xStringResourceResolver.is() &&
xStringResourceResolver->getLocales().hasElements() )
{
xRet = xStringResourceResolver;
xRet = std::move(xStringResourceResolver);
}
}
catch(const UnknownPropertyException&)

2
extensions/source/propctrlr/genericpropertyhandler.cxx
View file

@ -310,7 +310,7 @@ namespace pcr
m_xComponent.set( xIntrospectionAccess->queryAdapter( cppu::UnoType<XPropertySet>::get() ), UNO_QUERY_THROW );
// now that we survived so far, remember m_xComponentIntrospectionAccess
m_xComponentIntrospectionAccess = xIntrospectionAccess;
m_xComponentIntrospectionAccess = std::move(xIntrospectionAccess);
m_xPropertyState.set(m_xComponent, css::uno::UNO_QUERY);
m_bPropertyMapInitialized = false;

Some files were not shown because too many files have changed in this diff Show more