[Libreoffice-commits] core.git: 2 commits - sw/source unusedcode.easy
Caolán McNamara
caolanm at redhat.com
Sat Apr 26 02:21:25 PDT 2014
sw/source/core/tox/tox.cxx | 17 ++++++-----
unusedcode.easy | 66 ++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 74 insertions(+), 9 deletions(-)
New commits:
commit 3270de71b09ddaa72fadd70bf592c3ca7995513f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Apr 26 10:20:00 2014 +0100
callcatcher: update unused code
Change-Id: I86713d8f5516fafbd7e713e4fa85f4d7f02cb9ec
diff --git a/unusedcode.easy b/unusedcode.easy
index 3de349d..f75e3b1 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,12 +1,18 @@
BigInt::BigInt(unsigned int)
+CPhysicalCamera::CPhysicalCamera()
+CPhysicalCamera::GetAngleY()
CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const&)
ConfigurationAccess::getPath(rtl::OUString const&)
+DocumentHandler::DocumentHandler(com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler>&)
DocxSdrExport::getFlyFrameGraphic()
DocxSdrExport::setFlyFrameGraphic(bool)
DocxSdrExport::setFrameBtLr(bool)
EditEngine::IsIdleFormatterActive() const
+FPSCounter::getGPUTime()
FillAttributes::FillAttributes()
FillAttributes::getFillGradientAttribute() const
+Font::LoadSystemFont(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, int)
+Font::deleteFont()
GDriveDocument::GDriveDocument(GDriveSession*)
GDriveFolder::GDriveFolder(GDriveSession*)
GDriveProperty::GDriveProperty()
@@ -14,11 +20,13 @@ GDriveSession::GDriveSession()
Json::Json(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, Json, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, Json> > > const&)
Json::Json(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::shared_ptr<libcmis::Property>, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, boost::shared_ptr<libcmis::Property> > > > const&)
Json::swap(Json&)
+LWPFilterReader::LWPFilterReader()
MenuBar::AddMenuBarButton(Image const&, Link const&, rtl::OUString const&, unsigned short)
MenuBar::GetMenuBarButtonRectPixel(unsigned short)
MenuBar::RemoveMenuBarButton(unsigned short)
MenuBar::SetMenuBarButtonHighlightHdl(unsigned short, Link const&)
OpenGLContext::getOpenGLWindow()
+OutDevState::~OutDevState()
OutputDevice::GetCanvas() const
OutputDevice::HasAlpha()
OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&, MapMode const&)
@@ -26,12 +34,18 @@ OutputDevice::LogicToPixel(Region const&, MapMode const&) const
OutputDevice::LogicToPixel(basegfx::B2DPolygon const&) const
OutputDevice::LogicToPixel(basegfx::B2DPolygon const&, MapMode const&) const
OutputDevice::PixelToLogic(Region const&, MapMode const&) const
+RenderScene::loadScene(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
+RenderScene::renderMoveCamera(double, double, double, double)
+RenderScene::renderRotateCamera(double, double, double, double)
SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
ScBitMaskCompressedArray<int, unsigned char>::GetFirstForCondition(int, int, unsigned char const&, unsigned char const&) const
ScDocument::CreateFormatTable() const
ScDocument::GetRowFlagsArray(short) const
ScExtIButton::GetSelected() const
+ScFormulaCell::SwapWithinGroup(ScFormulaCell*)
ScFormulaCellGroup::scheduleCompilation()
+ScTable::GetCellTextAttr(short, int) const
+ScTable::TransferCellValuesFrom(short, int, sc::CellValues&)
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
SdrItemBrowser::ForceParent()
@@ -44,6 +58,12 @@ SdrTextObj::NbcSetMaxTextFrameWidth(long)
SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
SfxInt64Item::SetValue(long)
SfxVisibilityItem::GetValueCount() const
+ShaderProgram::createProgram(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
+ShaderProgram::setUniform(unsigned int, char const*, float)
+ShaderProgram::setUniform(unsigned int, char const*, glm::detail::tvec2<float>)
+ShaderProgram::setUniform(unsigned int, char const*, glm::detail::tvec3<float>)
+ShaderProgram::setUniform(unsigned int, char const*, glm::detail::tvec4<float>)
+ShaderProgram::setUniform(unsigned int, char const*, int*)
StyleSettings::SetActiveColor2(Color const&)
StyleSettings::SetCursorSize(long)
StyleSettings::SetDeactiveColor2(Color const&)
@@ -65,6 +85,7 @@ SwAccessibleMap::FireSectionChangeEvent(unsigned short, unsigned short)
SwExtraRedlineTbl::GetPos(SwExtraRedline const*) const
SwExtraRedlineTbl::Remove(unsigned short)
TextDoc::IsValidPaM(TextPaM const&)
+Texture::greateEmptyTexture(int, int, unsigned int)
UnoApiTest::closeDocument(com::sun::star::uno::Reference<com::sun::star::lang::XComponent>)
VCLXGraphics::getFillColor()
VCLXGraphics::getFont()
@@ -184,7 +205,10 @@ apitest::XText::testInsertRemoveTextContent()
apitest::XTextContent::testAttach()
apitest::XTextContent::testGetAnchor()
apitest::XTextField::testGetPresentation()
+basegfx::tools::containsOnlyHorizontalAndVerticalEdges(basegfx::B2DPolyPolygon const&)
canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
+chart::ChartTypeUnoDlg::Create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
+chart::ShapeToolbarController::create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
chart::opengl3D::Line::Line(unsigned int)
chart::opengl3D::Rectangle::Rectangle(unsigned int)
chart::opengl3D::Text::Text(unsigned int)
@@ -196,9 +220,49 @@ connectivity::file::OStatement_Base::reset()
connectivity::firebird::release(int&, cppu::OBroadcastHelperVar<cppu::OMultiTypeInterfaceContainerHelper, com::sun::star::uno::Type>&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&, com::sun::star::lang::XComponent*)
connectivity::sdbcx::OGroup::OGroup(bool)
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, bool)
+glTF::Camera::getLookAt()
+glTF::Camera::getPosition()
+glTF::Camera::getUp()
+glTF::Camera::setLookAt(glTF::Vector3D&)
+glTF::Camera::setPosition(glTF::Vector3D&)
+glTF::Camera::setUp(glTF::Vector3D&)
+glTF::Light::getAttenuationConstant()
+glTF::Light::getAttenuationLinear()
+glTF::Light::getAttenuationQuadratic()
+glTF::Light::getDirection()
+glTF::Light::getLightSourceType()
+glTF::Light::getName()
+glTF::Light::getPosition()
+glTF::Light::getPositions()
+glTF::Light::setAttenuationConstant(float)
+glTF::Light::setAttenuationLinear(float)
+glTF::Light::setAttenuationQuadratic(float)
+glTF::Light::setColor(glTF::Vector3D)
+glTF::Light::setDirection(glTF::Vector3D)
+glTF::Light::setName(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)
+glTF::MaterialProperty::getDataLength()
+glTF::Mesh::getMeshName()
+glTF::Node::getNodeName() const
+glTF::Node::getNodeType() const
+glTF::Node::getParentNode()
+glTF::Primitives::getAttributeSize() const
+glTF::Scene::findLightTransformation()
+glTF::Scene::getCameraMatrix() const
+glTF::TechAttribute::getAttributeIndex()
+glTF::TechUniform::getUniformIndex()
+glTF::TechUniform::getUniformName()
+glTF::Technique::getFragmentShader()
+glTF::Technique::getTechAttributeSize() const
+glTF::Technique::getTechUniform(unsigned int)
+glTF::Technique::getTechUniformSize() const
+glTF::Technique::getVertexShader()
+glTF::Technique::setProgramId(unsigned int)
+glTF::gltf_get_json_string(glTF::glTFHandle*)
oglcanvas::CanvasHelper::flush() const
oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const
-oox::drawingml::CustomShapeProperties::initializePresetDataMap()
+oox::drawingml::CustomShapeProvider::createParameterPairSequence(unsigned long, oox::drawingml::CustomShapeProvider::ParameterPairData const*)
+oox::drawingml::CustomShapeProvider::createSegmentSequence(unsigned long, unsigned short const*)
+oox::drawingml::CustomShapeProvider::createStringSequence(unsigned long, char const**)
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
sc::CLBuildKernelThread::CLBuildKernelThread()
sc::CLBuildKernelThread::consume()
commit af907213a26efc05bac2a02ab286a0f14aff3352
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Fri Apr 25 11:39:20 2014 +0000
Related: #i124451# application of index entry template patterns
-- do not propagate tab stops of unused paragraph styles
-- do not propagate default tab stops
(cherry picked from commit fd29c8d6368e5e6039dec45a1b40452a42e8d524)
Conflicts:
sw/source/core/tox/tox.cxx
Change-Id: I0fce96aeb951ff0b46ff14d2ebd13864532fecc2
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 3c4ced3..1e1a435 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -402,17 +402,15 @@ sal_uInt16 SwForm::GetFormMaxLevel( TOXTypes eTOXType )
void SwForm::AdjustTabStops( SwDoc& rDoc ) // #i21237#
{
- for(sal_uInt16 nLevel = 1; nLevel < GetFormMax(); nLevel++)
+ const sal_uInt16 nFormMaxLevel = GetFormMax();
+ for ( sal_uInt16 nLevel = 1; nLevel < nFormMaxLevel; ++nLevel )
{
- const OUString sTemplateName = GetTemplate(nLevel);
-
- SwTxtFmtColl* pColl = rDoc.FindTxtFmtCollByName( sTemplateName );
+ SwTxtFmtColl* pColl = rDoc.FindTxtFmtCollByName( GetTemplate(nLevel) );
if( pColl == NULL )
{
- const sal_uInt16 nId =
- SwStyleNameMapper::GetPoolIdFromUIName( sTemplateName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
- if ( USHRT_MAX != nId )
- pColl = rDoc.GetTxtCollFromPool( nId );
+ // Paragraph Style for this level has not been created.
+ // --> No need to propagate default values
+ continue;
}
const SvxTabStopItem* pTabStops = pColl != NULL ? &pColl->GetTabStops(sal_False) : 0;
@@ -428,6 +426,9 @@ void SwForm::AdjustTabStops( SwDoc& rDoc ) // #i21237#
{
const SvxTabStop& rTab = (*pTabStops)[nTab];
+ if ( rTab.GetAdjustment() == SVX_TAB_ADJUST_DEFAULT )
+ continue; // ignore the default tab stop
+
aIt = find_if( aIt, aCurrentPattern.end(), SwFormTokenEqualToFormTokenType(TOKEN_TAB_STOP) );
if ( aIt != aCurrentPattern.end() )
{
More information about the Libreoffice-commits
mailing list