outliner.cxx (f0de6be0) outliner.cxx (1fa2bb83)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 1899 unchanged lines hidden (view full) ---

1908 if( nDepth < nParaDepth )
1909 break;
1910
1911 const SvxNumberFormat* pFmt = GetNumberFormat( nPara );
1912
1913 if( pFmt == 0 )
1914 continue; // ignore paragraphs without bullets
1915
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 1899 unchanged lines hidden (view full) ---

1908 if( nDepth < nParaDepth )
1909 break;
1910
1911 const SvxNumberFormat* pFmt = GetNumberFormat( nPara );
1912
1913 if( pFmt == 0 )
1914 continue; // ignore paragraphs without bullets
1915
1916 // check if numbering is the same
1917 if( !isSameNumbering( *pFmt, *pParaFmt ) )
1916 // check if numbering less than or equal to pParaFmt
1917 if( !isSameNumbering( *pFmt, *pParaFmt ) || ( pFmt->GetStart() < pParaFmt->GetStart() ) )
1918 break;
1919
1918 break;
1919
1920 if ( pFmt->GetStart() > pParaFmt->GetStart() )
1921 {
1922 nNumber += pFmt->GetStart() - pParaFmt->GetStart();
1923 pParaFmt = pFmt;
1924 }
1925
1920 const SfxBoolItem& rBulletState = (const SfxBoolItem&) pEditEngine->GetParaAttrib( nPara, EE_PARA_BULLETSTATE );
1921
1922 if( rBulletState.GetValue() )
1923 nNumber += 1;
1924
1925 // same depth, same number format, check for restart
1926 const sal_Int16 nNumberingStartValue = pPara->GetNumberingStartValue();
1927 if( (nNumberingStartValue != -1) || pPara->IsParaIsNumberingRestart() )

--- 258 unchanged lines hidden --- 		1926 const SfxBoolItem& rBulletState = (const SfxBoolItem&) pEditEngine->GetParaAttrib( nPara, EE_PARA_BULLETSTATE );
1927
1928 if( rBulletState.GetValue() )
1929 nNumber += 1;
1930
1931 // same depth, same number format, check for restart
1932 const sal_Int16 nNumberingStartValue = pPara->GetNumberingStartValue();
1933 if( (nNumberingStartValue != -1) || pPara->IsParaIsNumberingRestart() )

--- 258 unchanged lines hidden ---